From a036040208ed15ef7029cb3aecc033a3200edeaf Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 12 Jan 2022 21:01:43 +0800
Subject: Fix merge conflicts

---
 .../shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
index a7dc89e45..afc3d30a0 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
@@ -114,7 +114,7 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
         }
         
         private Entry<K, V> mapEntry(Entry<K, V> entry) {
-            return new ForwardingMapEntry<>() {
+            return new ForwardingMapEntry<K, V>() {
                 @Override
                 @NotNull
                 protected Entry<K, V> delegate() {
-- 
cgit