music-encoding
diff --git a/‎_tutorials-FR/199_tutorials/tutorials.json
+4 b/‎_tutorials-FR/199_tutorials/tutorials.json
+4
@@ -5,7 +5,11 @@
         "descFile": "writingTutorials-01.html"
     },
     {
+<<<<<<< HEAD
         "label":"Configuration du site web",
+=======
+        "label":"Mise en route",
+>>>>>>> eb5ed6ba (add editor translations)
         "descFile": "writingTutorials-02.html"
     },
     {
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@`
`5`	`5`	`"descFile": "writingTutorials-01.html"`
`6`	`6`	`},`
`7`	`7`	`{`
	`8`	`+<<<<<<< HEAD`
`8`	`9`	`"label":"Configuration du site web",`
	`10`	`+=======`
	`11`	`+ "label":"Mise en route",`
	`12`	`+>>>>>>> eb5ed6ba (add editor translations)`
`9`	`13`	`"descFile": "writingTutorials-02.html"`
`10`	`14`	`},`
`11`	`15`	`{`