Remove change markers

Signed-off-by: Peter Nied <[email protected]>
peternied · Apr 3, 2024 · cc075b2 · cc075b2
1 parent 8433a6f
commit cc075b2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/server/src/test/java/org/opensearch/common/regex/RegexTests.java b/server/src/test/java/org/opensearch/common/regex/RegexTests.java
@@ -98,10 +98,7 @@ public void testDoubleWildcardMatch() {
         assertTrue(Regex.simpleMatch("fff*******ddd", "FffAbcdDd", true));
         assertFalse(Regex.simpleMatch("fff*******ddd", "FffAbcdDd", false));
         assertFalse(Regex.simpleMatch("fff******ddd", "fffabcdd"));
-// <<<<<<< HEAD
         assertFalse(Regex.simpleMatch("fff*******ddd", "FffAbcdDd", false));
-// =======
-// >>>>>>> origin/1.3
         assertTrue(Regex.simpleMatch("abCDefGH******ddd", "abCDefGHddd", false));
         assertTrue(Regex.simpleMatch("******", "a"));
         assertTrue(Regex.simpleMatch("***WILDcard***", "aaaaaaaaWILDcardZZZZZZ", false));