Conflict fixed on "Class checking: 'instanceof'" page in french

language

Author: HachemiH

1-js/09-classes/06-instanceof/article.md

@@ -93,19 +93,11 @@ let rabbit = new Rabbit();
 alert(rabbit instanceof Animal); // true
 */!*
 
-<<<<<<< HEAD
-// rabbit.__proto__ === Rabbit.prototype
+// rabbit.__proto__ === Animal.prototype (no match)
 *!*
 // rabbit.__proto__.__proto__ === Animal.prototype (match!)
 */!*
 ```
-=======
-    // rabbit.__proto__ === Animal.prototype (no match)
-    *!*
-    // rabbit.__proto__.__proto__ === Animal.prototype (match!)
-    */!*
-    ```
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
 
 Voici l'illustration de ce que `rabbit instanceof Animal` compare avec `Animal.prototype`: