Conflict fixed on "Date and time" page in french language

Author: HachemiH

1-js/05-data-types/11-date/article.md

@@ -353,11 +353,7 @@ let time1 = 0;
 let time2 = 0;
 
 *!*
-<<<<<<< HEAD
-// lance le test(upperSlice) et le test(upperLoop) toutes les 10 fois en alternance
-=======
-// run bench(diffSubtract) and bench(diffGetTime) each 10 times alternating
->>>>>>> 7b76185892aa9798c3f058256aed44a9fb413cc3
+// exécute bench(diffSubtract) et bench(diffGetTime) chaque 10 fois en alternance
 for (let i = 0; i < 10; i++) {
   time1 += bench(diffSubtract);
   time2 += bench(diffGetTime);