diff options
| author |  Googler <noreply@google.com> | 2017-07-13 00:01:42 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-07-13 09:56:58 +0200 |
| commit | 106fa1e01ea58867cbbed98f29bc2f71713bb008 (patch) | |
| tree | 99db0f5a545a5e392c36be2a18ed0a2d89602742 /src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java | |
| parent | 60eb53bca7348edebdb2b8e6734f6b748e990ec7 (diff) | |
Fix bug where merge conflicts for resources defined in XML with equal values were being falsely logged during build as warnings
RELNOTES: none
PiperOrigin-RevId: 161723206
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java')
0 files changed, 0 insertions, 0 deletions