Compare commits

...

3 Commits

Author SHA1 Message Date
3316489760 section contact 2024-09-16 15:16:31 +02:00
bfe3b46638 blabla2 2024-09-16 15:13:41 +02:00
9b10867d50 section contact 2024-09-16 15:08:17 +02:00

View File

@ -9,7 +9,15 @@
</header> </header>
<body> <body>
<h1> Bienvenue sur le site</h1> <h1> Bienvenue sur le site</h1>
<<<<<<< HEAD
<<<<<<< HEAD
<p> blabla </p> <p> blabla </p>
=======
<section> Contact </section>
>>>>>>> feature/contact
=======
<section> Contact </section>
>>>>>>> 9b10867 (section contact)
</body> </body>
<footer> <footer>
<p>&copy; 2024 - Entreprise</p> <p>&copy; 2024 - Entreprise</p>