From 75cb6be36fe0203a15a27af29af546c53f4823d0 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Sun, 11 Apr 2021 00:53:21 -0700
Subject: [PATCH] resolve merge issues

---
 .../src/main/java/com/dfsek/terra/registry/OpenRegistry.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java b/common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java
index 62103b018..f6b6a3917 100644
--- a/common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java
+++ b/common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * @param <T>
  */
 public class OpenRegistry<T> implements Registry<T> {
-    private final Map<String, T> objects;
+    private final Map<String, Entry<T>> objects;
 
     public OpenRegistry() {
         objects = new HashMap<>();
@@ -29,7 +29,6 @@ public class OpenRegistry<T> implements Registry<T> {
     protected OpenRegistry(Map<String, Entry<T>> init) {
         this.objects = init;
     }
-    private final Map<String, Entry<T>> objects = new HashMap<>();
 
     @Override
     public T load(Type type, Object o, ConfigLoader configLoader) throws LoadException {