branche header

2024-09-16 15:02:15 +02:00
1 changed files with 1 additions and 8 deletions
--- a/index.html
+++ b/index.html
@ -2,19 +2,12 @@
 <html lang="fr">
 <head>
 <meta charse ="utf-8">
-<title>Projet Site Web</title>
+<title>Prjet 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>