need to use state with executing state

2018-03-10 22:09:34 -05:00
parent 4bb3b25286
commit adae8e3d82
8 changed files with 77 additions and 85 deletions
--- a/kfc/src/main/resources/mcmod.info
+++ b/kfc/src/main/resources/mcmod.info
@@ -2,11 +2,7 @@
  "modid": "forgecraft",
  "name": "Kitsu's Forgecraft",
  "description": "Forged with sweat and blood",
-<<<<<<< HEAD
-  "version": "1.4.01",
-=======
  "version": "1.4.06",
->>>>>>> master-1.12
  "mcversion": "1.12.2",
  "url": "",
  "updateUrl": "",