Compare commits

...

2 Commits

Author SHA1 Message Date
21f9912af8 Merge branch 'release/1.0.0' 2024-09-16 15:26:08 +02:00
545805921b corrections index html 2024-09-16 15:18:48 +02:00

View File

@ -6,9 +6,15 @@
</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>