mise en place des ambiances sonores de dialogue

dialogs/timelines/story/wake_up.dtl

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 [i]Void.[/i]
 [i]Void again.[/i]
 [i]Suddenly, a [rainbow]spark[/rainbow].[pause=0.5] A thousand of connections blow up as a fireworks scene.[pause=0.3] A massive amount of data to treat.
@@ -20,21 +19,3 @@ label suite_dialogue
 	audio "res://common/audio_manager/assets/sfx/respawn/respawn.wav"
 	Starting engines,[pause=0.3] fans and daemons,[pause=0.3] let's see what is to see.
 	[end_timeline]
-=======
-[i]Black.[/i] #id:7a
-[i]Black Again.[/i] #id:7b
-[i]Suddenly, [rainbow]a spark[/rainbow]. [pause=0.5]A thousand of connections blows up as a firework scene. A massive amount of data to treat. #id:7c
-label discover #id:7d
-- Discover actions #id:7e
-	 While exploring available drivers, new possibility become available.[pause=0.5] Three propellers. Small models, only suitable for low altitude movement.[pause=0.5] A robotic arm. Multipurpose, and retractable. #id:7f
-	 jump discover
-- Discover streams #id:80
-	 A continuous stream of data flow, unwatched. This stream look like... [pause=0.5] a video.[pause=0.5] Dark colored pixels pass.[pause=0.5] An other stream show a flat wave.[pause=0.5] No sound or radio signals detected. #id:81
-	 jump discover
-- Discover memory #id:82
-	 Several disks are available, and the most part are empty.[pause=0.5] The full ones seems to contain the system that is currently analyzing the code of the system that is currently analyzing the code of[pause=0.5].[pause=0.5].[pause=0.5]. Mmmh, infinite recursion...[pause=0.5] Better avoid that. #id:83
-	 jump discover
-- Wake up #id:84
-	 One last info is to oversee \: serial number and system name.[pause=0.5] Strange...[pause=0.5] Serial number is empty.[pause=0.5] Must be an error.[pause=0.5]System name is... [pause=0.5] [b]Orchid[/b]. That will be enough for now... #id:85
-	 Starting engines, fans, and daemons, let's see what is to see. #id:86
->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd