From 23f8c0e7b2a8b2c48c4ab5d15060d6d690db9d9a Mon Sep 17 00:00:00 2001
From: Elisa <elisablancart@gmail.com>
Date: Tue, 12 May 2020 13:41:15 +0200
Subject: [PATCH] Update index.html

---
 src/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/index.html b/src/index.html
index 7a6c737..1ad0ea1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -33,12 +33,8 @@
 
         <section id="contact">
             <header>
-<<<<<<< HEAD
-                <h2>Contactez nougfffs</h2>
-=======
                 <h2>Contactez nous</h2>
             </header>
->>>>>>> master
             <form action="http://localhost:8080/submit" method="POST">
                 <input type="hidden" name="token" value="s0y6WANzU1XnYERoJxMwekP9pqilSVLK5Gbf3hmZadHB2rQ4u8" />
                 <div>