Compare commits
No commits in common. "1fb4a75251e6dadfe303c2b2aa79f69a8858d8b3" and "7501012d9a4c5a6ad118f3671996c622683544da" have entirely different histories.
1fb4a75251
...
7501012d9a
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,5 +0,0 @@
|
||||
# Ignorer tous les fichiers de logs
|
||||
*.log
|
||||
|
||||
# Ignorer tous les fichiers temporaires
|
||||
*.tmp
|
@ -2,18 +2,15 @@
|
||||
<html lang="fr>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Projet Site</title>
|
||||
<title>Projet Site Web</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Bienvenue sur le site de l'entreprise</h1>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<header>
|
||||
<h3>Entreprise - Services & Solutions</h3>
|
||||
<h2>Entreprise - Services & Solutions</h2>
|
||||
</header>
|
||||
<footer>
|
||||
<p>© 2024 -Entreprise</p>
|
||||
</footer>
|
||||
>>>>>>> release/1.0.0
|
||||
</body>
|
||||
</html>
|
||||
|
Loading…
Reference in New Issue
Block a user