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

Compare commits

base: noureddina:7501012d9a4c5a6ad118f3671996c622683544da
Branches Tags
noureddina:main
noureddina:develop
noureddina:feature/contact
...
compare: noureddina:1fb4a75251e6dadfe303c2b2aa79f69a8858d8b3
Branches Tags
noureddina:develop
noureddina:feature/contact
noureddina:main

7 Commits
7501012d9a ... 1fb4a75251

Author SHA1 Message Date
noureddina
1fb4a75251 Merge tag '1.0.1' into develop 
Probleme réglé
 2024-09-16 11:25:30 +02:00
noureddina
c66f455e5d Merge branch 'hotfix/1.0.1' 2024-09-16 11:24:37 +02:00
noureddina
434eb9a8cd Correction du lien cassé 2024-09-16 11:24:17 +02:00
noureddina
7b274ed416 Résolution des conflits de fusion dans index.html 2024-09-16 11:17:43 +02:00
noureddina
726b3943f3 Correction de la typo dans le header 2024-09-16 11:16:25 +02:00
noureddina
c85caf5e77 gitignore 2024-09-16 10:56:50 +02:00
noureddina
9e2b54d4dc Gitignore 2024-09-16 10:51:51 +02:00
2 changed files with 10 additions and 2 deletions
Show Stats 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>
<head>
<meta charset="UTF-8">
<title>Projet Site Web</title>
<title>Projet Site</title>
</head>
<body>
<h1>Bienvenue sur le site de l'entreprise</h1>
<<<<<<< HEAD
=======
<header>
<h2>Entreprise - Services & Solutions</h2>
<h3>Entreprise - Services & Solutions</h3>
</header>
<footer>
<p>&copy; 2024 -Entreprise</p>
</footer>
>>>>>>> release/1.0.0
</body>
</html>