removing mistakes

zero-to-mastery · Oct 3, 2024 · 707da95 · 707da95
1 parent 0a8d4b3
commit 707da95
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/gameObjects/map_start/index.js b/src/gameObjects/map_start/index.js
@@ -3,13 +3,12 @@ import { cake } from './cake.gameObject';
 import { npcsOnChairs } from './npcsOnChairs.gameObject';
 import { ztmTrailer } from './ztmTrailer.gameObject';
 import { computer } from './computer.gameObject';
-<<<<<<< HEAD
 
 import { misterFu } from './misterFu.gameObject';
 
-=======
+
 import { jokeTellerNPC } from './jokeTellerNPC.gameObject';
->>>>>>> 512ce3f3184bdde96d1833cf9540cc3559345b00
+
 const gameObjects = [
     bruno,
     npcsOnChairs,