From cce32a84cf7243c19c104892938284bb216d3455 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 28 Jul 2016 19:36:56 +0000 Subject: MergeConflict: fix typo in error message string. -- MOS_MIGRATED_REVID=128729088 --- .../android/java/com/google/devtools/build/android/MergeConflict.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/android/java/com/google/devtools') 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; -- cgit v1.2.3