corrections index html

2024-09-16 15:18:48 +02:00 · 2024-09-16 15:18:48 +02:00 · 545805921b
commit 545805921b
parent 92856d87a4
1 changed files with 6 additions and 0 deletions
--- a/index.html
+++ b/index.html
@ -6,8 +6,14 @@
 </head>
 <body>
 <h1> Bienvenue sur le sitre de l'entreprise</h1>
+<<<<<<< HEAD
 <footer>
 <p>&copy; 2024 - Entreprise</p>
 </footer>
+=======
+<header>
+<h2>Entreprise - Service & solutions </h2>
+</header>
+>>>>>>> feature/header2
 </body>
 </html>