Fixed merge errors
This commit is contained in:
BIN
Assets/Audio/Music/Level1.mp3
Normal file
BIN
Assets/Audio/Music/Level1.mp3
Normal file
Binary file not shown.
19
Assets/Audio/Music/Level1.mp3.import
Normal file
19
Assets/Audio/Music/Level1.mp3.import
Normal file
@@ -0,0 +1,19 @@
|
||||
[remap]
|
||||
|
||||
importer="mp3"
|
||||
type="AudioStreamMP3"
|
||||
uid="uid://dq1cnjtb2whma"
|
||||
path="res://.godot/imported/Level1.mp3-30f3515015616548e8974daad27cbb3e.mp3str"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Assets/Audio/Music/Level1.mp3"
|
||||
dest_files=["res://.godot/imported/Level1.mp3-30f3515015616548e8974daad27cbb3e.mp3str"]
|
||||
|
||||
[params]
|
||||
|
||||
loop=false
|
||||
loop_offset=0
|
||||
bpm=0
|
||||
beat_count=0
|
||||
bar_beats=4
|
||||
BIN
Assets/Audio/Music/MainMenu.mp3
Normal file
BIN
Assets/Audio/Music/MainMenu.mp3
Normal file
Binary file not shown.
19
Assets/Audio/Music/MainMenu.mp3.import
Normal file
19
Assets/Audio/Music/MainMenu.mp3.import
Normal file
@@ -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
|
||||
BIN
Assets/Audio/Music/MainTheme.mmpz
Normal file
BIN
Assets/Audio/Music/MainTheme.mmpz
Normal file
Binary file not shown.
Reference in New Issue
Block a user