Compare commits

..

No commits in common. "master" and "release/1.0.0" have entirely different histories.

View File

@ -9,7 +9,6 @@
<<<<<<< HEAD
<footer>
<p>&copy; 2024 - Entreprise</p>
<p> modif </p>
</footer>
=======
<header>