Merge branch 'release/1.0.0'

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