Fix merge commit issue

IMS212 · Aug 6, 2024 · 001f680 · 001f680
1 parent 56dc8ed
commit 001f680
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/texture/SpriteFinderCache.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/texture/SpriteFinderCache.java
@@ -26,11 +26,7 @@ public static SpriteFinder forBlockAtlas() {
         return blockAtlasSpriteFinder;
     }
 
-<<<<<<<< HEAD:common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/SpriteFinderCache.java
-    public static class ReloadListener implements SimpleSynchronousResourceReloadListener {
-========
     public static class ReloadListener implements ResourceManagerReloadListener, IdentifiableResourceReloadListener {
->>>>>>>> ml:fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/texture/SpriteFinderCache.java
         public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("sodium", "sprite_finder_cache");
         public static final List<ResourceLocation> DEPENDENCIES = List.of(ResourceReloadListenerKeys.MODELS);
         public static final ReloadListener INSTANCE = new ReloadListener();