From 0e1c2c118a6fcd997089565da6f9edf7c5989445 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 19 Aug 2021 17:50:32 +0800
Subject: Fix conflicts

---
 .../java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java  | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
index 18a6c3b65..621ee02e4 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
@@ -69,7 +69,6 @@ import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
@@ -324,10 +323,6 @@ public class ConfigManagerImpl implements ConfigManager {
             public List<? extends GuiEventListener> children() {
                 return Collections.emptyList();
             }
-            
-            public List<? extends NarratableEntry> narratables() {
-                return Collections.emptyList();
-            }
         }
         
         try {
-- 
cgit