fix rebase

FancyMcPlugins · Nov 23, 2024 · 08dbdb6 · 08dbdb6
1 parent 7d471c6
commit 08dbdb6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/api/src/main/java/de/oliver/fancynpcs/api/NpcData.java b/api/src/main/java/de/oliver/fancynpcs/api/NpcData.java
@@ -23,11 +23,7 @@ public class NpcData {
     private final String name;
     private final UUID creator;
     private String displayName;
-<<<<<<< HEAD
-    @Deprecated private SkinFetcher.SkinData skin;
-=======
     private SkinData skin;
->>>>>>> 915c114 (Refactor skin management and remove outdated skin fetching logic)
     private boolean mirrorSkin;
     private Location location;
     private boolean showInTab;