From b5bdc0b37dcaa05b5184114da5039a73d982a1c9 Mon Sep 17 00:00:00 2001 From: JanaDupcakova Date: Tue, 23 Apr 2024 20:07:41 +0200 Subject: [PATCH] SMA 95 solved merge conflict --- .../test/java/com/sportsmatch/services/UserServiceImpTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/sportsmatch/src/test/java/com/sportsmatch/services/UserServiceImpTest.java b/backend/sportsmatch/src/test/java/com/sportsmatch/services/UserServiceImpTest.java index 726573a..56b8b53 100644 --- a/backend/sportsmatch/src/test/java/com/sportsmatch/services/UserServiceImpTest.java +++ b/backend/sportsmatch/src/test/java/com/sportsmatch/services/UserServiceImpTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; - import com.sportsmatch.BaseTest; import com.sportsmatch.dtos.SportDTO; import com.sportsmatch.dtos.UserDTO;