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

Résolution des conflits de fusion dans index.html

Browse Source
This commit is contained in:
noureddina 2024-09-16 11:17:43 +02:00
commit 7b274ed416
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
index.html
View File

@ -6,5 +6,14 @@
</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
</body> </body>
</html> </html>