From 26396ce7db82d68a262ccdb7b88fbe550f3c478b Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Mon, 4 Oct 2021 14:50:55 -0400 Subject: [PATCH] Fix some merge issues --- game/assets/levels/level_4/zones.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/assets/levels/level_4/zones.json b/game/assets/levels/level_4/zones.json index 32eb6ac..f92e50b 100644 --- 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,