Compare commits

..

No commits in common. "develop" and "main" have entirely different histories.

View File

@ -2,21 +2,9 @@
<html lang="fr> <html lang="fr>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Projet Site</title> <title>Projet Site Web</title>
</head> </head>
<body> <body>
<h1>Bienvenue sur le site de l'entreprise</h1> <h1>Bienvenue sur le site de l'entreprise</h1>
<<<<<<< HEAD
=======
<header>
<h3>Entreprise - Services & Solutions</h3>
</header>
<footer>
<p>&copy; 2024 -Entreprise</p>
</footer>
>>>>>>> release/1.0.0
<section>
<h2>Contactez-nous</h2>
</section>
</body> </body>
</html> </html>