noureddina/Git_TP1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag '1.0.1' into develop

Browse Source 
Probleme réglé
This commit is contained in:
noureddina 2024-09-16 11:25:30 +02:00
commit 1fb4a75251
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored Normal file
View File

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

7
index.html
View File

@ -2,15 +2,18 @@
<html lang="fr> <html lang="fr>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Projet Site Web</title> <title>Projet Site</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>
<h2>Entreprise - Services & Solutions</h2> <h3>Entreprise - Services & Solutions</h3>
</header> </header>
<footer> <footer>
<p>&copy; 2024 -Entreprise</p> <p>&copy; 2024 -Entreprise</p>
</footer> </footer>
>>>>>>> release/1.0.0
</body> </body>
</html> </html>