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

Compare commits

merge into: noureddina:main
Branches Tags
noureddina:main
noureddina:develop
noureddina:feature/contact
...
pull from: noureddina:develop
Branches Tags
noureddina:develop
noureddina:feature/contact
noureddina:main

9 Commits
main ... develop

Author SHA1 Message Date
noureddina
f997edc321 Ajout de la section contact avec erreur 2024-09-16 11:54:49 +02:00
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
7501012d9a Add footer 2024-09-16 11:13:18 +02:00
noureddina
8875b3de0a Add header 2024-09-16 11:10:12 +02:00
noureddina
b2a7145633 Mise en place de l'index.html 2024-09-16 10:59:59 +02:00
1 changed files with 13 additions and 1 deletions
Show Stats Expand all files Collapse all files

14
index.html
View File

@ -2,9 +2,21 @@
<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>
<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>