From 6c2d357dca40eab5129cf1d1ffc9fbe73f7d0654 Mon Sep 17 00:00:00 2001 From: yhampe Date: Mon, 18 Nov 2024 09:45:26 +0100 Subject: [PATCH] RED-9472: solving merge conflicts --- .../integration/utils/AbstractPersistenceServerServiceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java index d6712bda4..f1ac53605 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java @@ -5,7 +5,6 @@ import static com.iqser.red.service.peristence.v1.server.integration.utils.Mongo import static com.iqser.red.service.peristence.v1.server.integration.utils.MongoDBTestContainer.MONGO_USERNAME; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import java.util.ArrayList;