diff --git a/index.html b/index.html index 87cf95a..ceb6ca0 100644 --- a/index.html +++ b/index.html @@ -6,5 +6,14 @@

Bienvenue sur le site de l'entreprise

+<<<<<<< HEAD +======= +
+

Entreprise - Services & Solutions

+
+ +>>>>>>> release/1.0.0