diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-01-12 21:01:43 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-01-12 21:01:43 +0800 |
| commit | a036040208ed15ef7029cb3aecc033a3200edeaf (patch) | |
| tree | 39f8e5ff9e6821da53c7f77811760a5cae8bc3eb /runtime/src/main/java | |
| parent | 73cd013c601c90106016f81112535541f1ccef47 (diff) | |
| download | RoughlyEnoughItems-a036040208ed15ef7029cb3aecc033a3200edeaf.tar.gz RoughlyEnoughItems-a036040208ed15ef7029cb3aecc033a3200edeaf.tar.bz2 RoughlyEnoughItems-a036040208ed15ef7029cb3aecc033a3200edeaf.zip | |
Fix merge conflicts
Diffstat (limited to 'runtime/src/main/java')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
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() { |