From cc075b2ca2518e492f6ae536ed6b325e70c193c5 Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Wed, 3 Apr 2024 06:16:42 -0500 Subject: [PATCH] Remove change markers Signed-off-by: Peter Nied --- .../src/test/java/org/opensearch/common/regex/RegexTests.java | 3 --- 1 file changed, 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 index 22ba1432850ea..b94bb16cbc4b2 100644 --- 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));