From 50a7877d065532d2a082fbc9e51d99587c59d2a9 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 1 Jun 2023 17:36:27 +0800
Subject: Fix rebase conflicts

---
 .../common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java     | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'runtime/src/main/java/me')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java
index 7069511ab..f16d8d390 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java
@@ -124,10 +124,6 @@ public class CollapsibleEntryRegistryImpl implements CollapsibleEntryRegistry {
             return id;
         }
         
-        public ResourceLocation getId() {
-            return id;
-        }
-        
         public String getModId() {
             return id.getNamespace();
         }
-- 
cgit