diff --git a/index.html b/index.html index 66e1580..2721701 100644 --- a/index.html +++ b/index.html @@ -9,11 +9,15 @@

Bienvenue sur le site

+<<<<<<< HEAD <<<<<<< HEAD

blabla

=======
Contact
>>>>>>> feature/contact +======= +
Contact
+>>>>>>> 9b10867 (section contact)