From 2b66f20365b9934100123b6358477cd640026f6c Mon Sep 17 00:00:00 2001
From: Jennie Robinson Faber <jennie@jenniefaber.com>
Date: Sun, 10 May 2026 16:33:51 +0100
Subject: [PATCH] Fix merge issues

---
 scenes/game.tscn | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scenes/game.tscn b/scenes/game.tscn
index 369af76..8d4811a 100644
--- a/scenes/game.tscn
+++ b/scenes/game.tscn
@@ -23,10 +23,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.004168272, 1.1920929e-07,
 
 [node name="ElevatorPanel" parent="CanvasPanel" unique_id=574176994 instance=ExtResource("3_lnu2h")]
 
-<<<<<<< HEAD
-[node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("5_iywne")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.004472971, 0)
-=======
 [node name="SfxDing" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=529226129]
 stream = ExtResource("4_p57ef")
 
@@ -39,4 +35,3 @@ stream = ExtResource("6_gee14")
 [node name="SfxChase" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=812445001]
 
 [node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("9_0tnpc")]
->>>>>>> f2b176c978c80dee71e2e640451aa7b607238400