aboutsummaryrefslogtreecommitdiffstats
path: root/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
diff options
context:
space:
mode:
Diffstat (limited to 'godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn')
-rw-r--r--godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn4
1 files changed, 4 insertions, 0 deletions
diff --git a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
index 0e4c8dc..c1c8707 100644
--- a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
+++ b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
@@ -3,6 +3,10 @@
[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Wall.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Floor.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/sounds/Uuhhh.mp3" type="AudioStream" id=4]
+<<<<<<< HEAD
+=======
+[ext_resource path="res://scenes/Die.tscn" type="PackedScene" id=5]
+>>>>>>> menu
[node name="TestScene" type="Spatial"]