Fixed conflicts
This commit is contained in:
@@ -27,4 +27,4 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user
@@ -27,4 +27,4 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||