Compare commits
No commits in common. "33164897606438ae62db691ab6ff08e9d6d3eeb9" and "ee87f9100d76346a2f90467794b5bedb3fc762fa" have entirely different histories.
3316489760
...
ee87f9100d
@ -9,15 +9,7 @@
|
|||||||
</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>© 2024 - Entreprise</p>
|
<p>© 2024 - Entreprise</p>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user