Fix some merge issues

2021-10-04 14:50:55 -04:00 · 2021-10-04 14:50:55 -04:00 · 26396ce7db
commit 26396ce7db
parent 8b158cfa75
1 changed files with 1 additions and 1 deletions
--- a/game/assets/levels/level_4/zones.json
+++ b/game/assets/levels/level_4/zones.json
@ -68,8 +68,8 @@
            "width": 322,
            "height": 64
        }
-
    ],
+    "kill": [],
    "win": {
        "x": 12000,
        "y": 0,