Compare commits

..

No commits in common. "1fb4a75251e6dadfe303c2b2aa79f69a8858d8b3" and "7501012d9a4c5a6ad118f3671996c622683544da" have entirely different histories.

2 changed files with 2 additions and 10 deletions

5
.gitignore vendored
View File

@ -1,5 +0,0 @@
# Ignorer tous les fichiers de logs
*.log
# Ignorer tous les fichiers temporaires
*.tmp

View File

@ -2,18 +2,15 @@
<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> <header>
<h3>Entreprise - Services & Solutions</h3> <h2>Entreprise - Services & Solutions</h2>
</header> </header>
<footer> <footer>
<p>&copy; 2024 -Entreprise</p> <p>&copy; 2024 -Entreprise</p>
</footer> </footer>
>>>>>>> release/1.0.0
</body> </body>
</html> </html>