correc

2 years ago · 958728462a
parent 3ad22f5684
commit 958728462a
1 changed files with 0 additions and 4 deletions
--- a/code/index.html
+++ b/code/index.html
@ -6,9 +6,6 @@
    </head>

    <body>
-<<<<<<< HEAD
-        [INSERER LA SAE]
-=======
        <header>

        </header>
@ -18,6 +15,5 @@
        <footer>

        </footer>
->>>>>>> 8774af8a4ebcf99adcb9e61d552cfb9190551f1c
    </body>
 </html>