diff options
| author |  Googler <noreply@google.com> | 2016-07-28 19:36:56 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-07-29 10:11:19 +0000 |
| commit | cce32a84cf7243c19c104892938284bb216d3455 (patch) | |
| tree | f6f0a94faa49d4253d7147b7e279003722b90144 /src/tools/android/java/com/google/devtools | |
| parent | 0e5b8b76595380fd3fa9e91e8f476917eecdb59b (diff) | |
MergeConflict: fix typo in error message string.
--
MOS_MIGRATED_REVID=128729088
Diffstat (limited to 'src/tools/android/java/com/google/devtools')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/MergeConflict.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java index 727df64573..4992da61ae 100644 --- a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java +++ b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java @@ -29,7 +29,7 @@ import java.util.Objects; @Immutable public class MergeConflict { private static final String CONFLICT_MESSAGE = "\n\u001B[31mCONFLICT:\u001B[0m" - + " %s is provided with ambigious priority from: \n\t%s\n\t%s"; + + " %s is provided with ambiguous priority from: \n\t%s\n\t%s"; private final DataKey dataKey; private final DataValue first; |