Compare commits

..

No commits in common. "master" and "hotfix1.0.1" have entirely different histories.

View File

@ -6,15 +6,9 @@
</head> </head>
<body> <body>
<h1> Bienvenue sur le sitre de l'entreprise</h1> <h1> Bienvenue sur le sitre de l'entreprise</h1>
<<<<<<< HEAD
<footer> <footer>
<p>&copy; 2024 - Entreprise</p> <p>&copy; 2024 - Entreprise</p>
<p> modif </p> <p> modif </p>
</footer> </footer>
=======
<header>
<h2>Entreprise - Service & solutions </h2>
</header>
>>>>>>> feature/header2
</body> </body>
</html> </html>