blabla2

2024-09-16 15:13:41 +02:00 · 2024-09-16 15:13:41 +02:00 · bfe3b46638
commit bfe3b46638
parent ee87f9100d 9b10867d50
1 changed files with 4 additions and 0 deletions
--- a/index.html
+++ b/index.html
@ -9,7 +9,11 @@
 </header>
 <body>
        <h1> Bienvenue sur le site</h1>
+<<<<<<< HEAD
 	<p> blabla </p>
+=======
+	<section> Contact </section>
+>>>>>>> feature/contact
 </body>
 <footer>
 	<p>&copy; 2024 - Entreprise</p>