From 3e5d80338fe0fc32e41cc58ae2b1ca6f3252974b Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Sat, 30 Mar 2024 21:20:24 -0700 Subject: [PATCH] Fix jdk21 test in master --- .../jackson/databind/jdk21/Java21CollectionsTest.java | 8 +------- 1 file changed, 1 insertion(+), 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 index ec9cc7099c..b53f469ad7 100644 --- 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;