Fix the conflicts

Signed-off-by: Ryan Liang <jiallian@amazon.com>
peternied · May 10, 2023 · 9515181 · 9515181
1 parent 06055c3
commit 9515181
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java b/...java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java
@@ -38,11 +38,7 @@ protected boolean matchesSafely(GetSettingsResponse response, Description mismat
 			if (!indexToSettings.containsKey(index)) {
 				mismatchDescription
 						.appendText("Response contains settings of indices: ")
-<<<<<<< HEAD
 						.appendValue(indexToSettings.keySet().toArray());
-=======
-						.appendValue(indexToSettings.keySet());
->>>>>>> main
 				return false;
 			}
 		}