mise en place des ambiances sonores de dialogue

common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://dadg6o6dl2k6t"
+uid="uid://1dj3v6rpcddu"
 path="res://.godot/imported/ship_music.ogg-a35a322e3a6a4adafae0f2adcaf21247.oggvorbisstr"
 
 [deps]
@@ -12,14 +12,8 @@ dest_files=["res://.godot/imported/ship_music.ogg-a35a322e3a6a4adafae0f2adcaf212
 
 [params]
 
-<<<<<<< HEAD
 loop=true
-loop_offset=0.0
-bpm=0.0
-=======
-loop=false
 loop_offset=0
 bpm=0
->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 beat_count=0
 bar_beats=4