Merge branch 'main' of https://github.com/DahmaneYanis/SAE-01-06

2 years ago · 3ad22f5684
parent 5e5dec07e2 8774af8a4e
commit 3ad22f5684
1 changed files with 12 additions and 0 deletions
--- a/code/index.html
+++ b/code/index.html
@ -6,6 +6,18 @@
    </head>

    <body>
+<<<<<<< HEAD
        [INSERER LA SAE]
+=======
+        <header>
+
+        </header>
+        <section>
+
+        </section>
+        <footer>
+
+        </footer>
+>>>>>>> 8774af8a4ebcf99adcb9e61d552cfb9190551f1c
    </body>
 </html>