fixed spawner.josn

UQcsse3200 · Oct 19, 2023 · d1e080c · d1e080c
1 parent 72fe086
commit d1e080c
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/source/core/assets/levels/earth/main_area/entities/spawners.json b/source/core/assets/levels/earth/main_area/entities/spawners.json
@@ -4,7 +4,6 @@
     {
       "class": "com.csse3200.game.entities.configs.SpawnerConfig",
       "wave1" : {
-<<<<<<< Updated upstream
         "roboMan" : 5,
         "redGhost" : 5,
         "chain": 0
@@ -18,21 +17,6 @@
         "roboMan" : 10,
         "redGhost" : 10,
         "chain": 0
-=======
-        "necromancer" : 1,
-        "roboMan" : 1,
-        "chain" : 1
-      },
-      "wave2" : {
-        "redGhost" : 1,
-        "roboMan" : 1,
-        "necromancer" : 1
-      },
-      "wave3" : {
-        "roboMan" : 1,
-        "necromancer" : 1,
-        "Knight" : 1
->>>>>>> Stashed changes
       },
       "position": {
         "x": 1,