Fix imports

FancyMcPlugins · Jan 15, 2025 · 07e4df9 · 07e4df9
1 parent e1d8b0c
commit 07e4df9
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/main/java/de/oliver/fancynpcs/tests/FancyNpcsTests.java b/src/main/java/de/oliver/fancynpcs/tests/FancyNpcsTests.java
@@ -1,14 +1,9 @@
 package de.oliver.fancynpcs.tests;
 
-<<<<<<< HEAD:src/main/java/de/oliver/fancynpcs/tests/FancyNpcsTests.java
 import de.oliver.fancylib.tests.FPTestClass;
+import de.oliver.fancynpcs.tests.api.ChatColorHandlerTest;
 import de.oliver.fancynpcs.tests.api.CreateNpcTest;
 import de.oliver.fancynpcs.tests.commands.*;
-=======
-import de.oliver.fancynpcs.tests.FNTestClass;
-import de.oliver.fancynpcs.tests.impl.api.ChatColorHandlerTest;
-import de.oliver.fancynpcs.tests.impl.api.CreateNpcTest;
->>>>>>> 74b9813 (add back chatcolor tests):src/main/java/de/oliver/fancynpcs/tests/impl/FancyNpcsTests.java
 import de.oliver.fancynpcs.tests.impl.api.skin.SkinManagerTest;
 import org.bukkit.entity.Player;