fixed conflicts

zero-to-mastery · Oct 31, 2024 · fce679a · fce679a
1 parent cb09ce7
commit fce679a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/interactions/map_arcade/index.js b/src/interactions/map_arcade/index.js
@@ -12,6 +12,7 @@ import { interactionWithGameMachine12 } from './game_machine_12.interaction';
 import { interactionWithGameMachine3 } from './game_machine_3.interactions';
 import { interactionWithGameMachineCrawl } from './game_machine_crawl.interaction';
 import { interactionWithGameMachine9 } from './game_machine_9.interactions';
+import { interactionWithGameMachine5 } from './game_machine_5.interactions';
 import { interactionWithGameMachine7 } from './game_machine_7.interaction';
 
 const interactions = [
@@ -36,6 +37,7 @@ const interactions = [
     interactionWithGameMachine11,
     interactionWithGameMachine12,
     interactionWithGameMachineCrawl,
+    interactionWithGameMachine5,
 ];
 
-export default interactions;
+export default interactions;