Fix jdk21 test in master

FasterXML · Mar 31, 2024 · 3e5d803 · 3e5d803
1 parent 75fad76
commit 3e5d803
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/test-jdk21/java/tools/jackson/databind/jdk21/Java21CollectionsTest.java b/src/test-jdk21/java/tools/jackson/databind/jdk21/Java21CollectionsTest.java
@@ -2,15 +2,9 @@
 
 import java.util.*;
 
-<<<<<<< HEAD:src/test-jdk21/java/tools/jackson/databind/jdk21/Java21CollectionsTest.java
-import tools.jackson.databind.BaseMapTest;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.json.JsonMapper;
-=======
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
->>>>>>> 2.18:src/test-jdk21/java/com/fasterxml/jackson/databind/jdk21/Java21CollectionsTest.java
+import tools.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;