Fixed conflicts

This commit is contained in:
0xSeb
2015-06-26 18:40:11 +02:00
6 changed files with 19 additions and 20 deletions
@@ -27,4 +27,4 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy {
}
}
}