Merge branch 'release/1.0.0'

modif
corrections index html
2024-09-16 15:26:08 +02:00 · 2024-09-16 15:23:31 +02:00 · 2024-09-16 15:18:48 +02:00 · 2024-09-16 15:06:39 +02:00
1 changed files with 11 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -2,9 +2,19 @@
 <html lang="fr">
 <head>
 <meta charse ="utf-8">
-<title>Prjet Site Web</title>
+<title>Projet Site Web</title>
 </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>
Author	SHA1	Message	Date
bayardk	21f9912af8	Merge branch 'release/1.0.0'	2024-09-16 15:26:08 +02:00
bayardk	d2a3bcb8d8	modif	2024-09-16 15:23:31 +02:00
bayardk	545805921b	corrections index html	2024-09-16 15:18:48 +02:00
bayardk	92856d87a4	envoie du footer	2024-09-16 15:06:39 +02:00