Conflicts fixed on "Basic operators, maths" solution page in french

language

Author: HachemiH

1-js/02-first-steps/08-operators/3-primitive-conversions-questions/solution.md

@@ -9,14 +9,8 @@ true + false = 1
 "$" + 4 + 5 = "$45"
 "4" - 2 = 2
 "4px" - 2 = NaN
-<<<<<<< HEAD
-7 / 0 = Infinity
-" -9  " + 5 = " -9  5" // (3)
-" -9  " - 5 = -14 // (4)
-=======
 "  -9  " + 5 = "  -9  5" // (3)
 "  -9  " - 5 = -14 // (4)
->>>>>>> 7533c719fbf62ba57188d6d51fe4c038b282bd0c
 null + 1 = 1 // (5)
 undefined + 1 = NaN // (6)
 " \t \n" - 2 = -2 // (7)

1-js/02-first-steps/08-operators/3-primitive-conversions-questions/task.md

@@ -16,14 +16,8 @@ true + false
 "$" + 4 + 5
 "4" - 2
 "4px" - 2
-<<<<<<< HEAD
-7 / 0
-"  -9\n" + 5
-"  -9\n" - 5
-=======
 "  -9  " + 5
 "  -9  " - 5
->>>>>>> 7533c719fbf62ba57188d6d51fe4c038b282bd0c
 null + 1
 undefined + 1
 " \t \n" - 2