Compare commits
3 Commits
ee87f9100d
...
3316489760
Author | SHA1 | Date | |
---|---|---|---|
3316489760 | |||
bfe3b46638 | |||
9b10867d50 |
@ -9,7 +9,15 @@
|
||||
</header>
|
||||
<body>
|
||||
<h1> Bienvenue sur le site</h1>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<p> blabla </p>
|
||||
=======
|
||||
<section> Contact </section>
|
||||
>>>>>>> feature/contact
|
||||
=======
|
||||
<section> Contact </section>
|
||||
>>>>>>> 9b10867 (section contact)
|
||||
</body>
|
||||
<footer>
|
||||
<p>© 2024 - Entreprise</p>
|
||||
|
Loading…
Reference in New Issue
Block a user