diff --git a/index.html b/index.html index 4354f84..66e1580 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,11 @@

Bienvenue sur le site

+<<<<<<< HEAD

blabla

+======= +
Contact
+>>>>>>> feature/contact