Merge branch 'release/1.0.0'
This commit is contained in:
commit
21f9912af8
@ -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>© 2024 - Entreprise</p>
|
<p>© 2024 - Entreprise</p>
|
||||||
<p> modif </p>
|
<p> modif </p>
|
||||||
</footer>
|
</footer>
|
||||||
|
=======
|
||||||
|
<header>
|
||||||
|
<h2>Entreprise - Service & solutions </h2>
|
||||||
|
</header>
|
||||||
|
>>>>>>> feature/header2
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
Reference in New Issue
Block a user