Fixed merge errors

2026-01-19 10:41:03 -07:00
parent 9e0eed66c3
commit 985a975577
50 changed files with 1622 additions and 81 deletions
--- a/Assets/Audio/Music/MainMenu.mp3.import
+++ b/Assets/Audio/Music/MainMenu.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dsxarngq2a8bh"
+path="res://.godot/imported/MainMenu.mp3-6986c2f1bdc31a4ee60b698abd6d4879.mp3str"
+
+[deps]
+
+source_file="res://Assets/Audio/Music/MainMenu.mp3"
+dest_files=["res://.godot/imported/MainMenu.mp3-6986c2f1bdc31a4ee60b698abd6d4879.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4