From 07e4df9b75e387b330a03424197af2738162a8ba Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 15 Jan 2025 10:00:36 +0100 Subject: [PATCH] Fix imports --- .../java/de/oliver/fancynpcs/tests/FancyNpcsTests.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/de/oliver/fancynpcs/tests/FancyNpcsTests.java b/src/main/java/de/oliver/fancynpcs/tests/FancyNpcsTests.java index 47903cd5..2f38a955 100644 --- 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;