From cd102bf8d1d86dec40bb7d87dca9c4fff443ee47 Mon Sep 17 00:00:00 2001
From: KEZEL BENOIT p1907091 <p1907091@univ-lyon1.fr>
Date: Mon, 16 Dec 2019 13:12:12 +0100
Subject: [PATCH] fix bug commit

---
 Assets/Pages/Autres/checkout.html | 46 ++-----------------------------
 index.html                        | 41 +--------------------------
 2 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/Assets/Pages/Autres/checkout.html b/Assets/Pages/Autres/checkout.html
index 713732e..c3b1dd4 100644
--- a/Assets/Pages/Autres/checkout.html
+++ b/Assets/Pages/Autres/checkout.html
@@ -89,51 +89,9 @@
                 </tbody>
             </table>
         </div>
-<<<<<<< HEAD
-    </div>
 
-    <footer>
-        <table>
-            <tbody>
-            <tr>
-                <th>Accès rapide</th><th></th>
-            </tr>
-            <tr>
-                <td><a href="#">Accueil</a></td>
-                <td><a href="#slider">Nos Promotions</a></td>
-                
-            </tr>
-            <tr>
-                <td><a href="#produits">Nos Produits</a></td>
-                <td><a href="Assets/Pages/Autres/checkout.html">Votre panier</a></td>
-                
-            </tr>
-            </tbody>
-        </table>
-        <h1>Nos réseaux sociaux :</h1>
-        <table id="reseaux">
-            <tr id="res">
-                <td>
-                    <a href="#"><img src="../../Images/Icones/facebook.png" alt></a>
-                </td>
-                <td>
-                    <a href="#"><img src="../../Images/Icones/twitter.png" alt></a>
-                </td>
-                <td>
-                    <a href="#"><img src="../../Images/Icones/yt.png" alt></a>
-                </td>
-                <td>
-                    <a href="#"><img src="../../Images/Icones/insta.png" alt></a>
-                </td>
-            </tr>
-        </table>   
+    </footer>
+
     
-    </footer>
 </body>
-
-=======
-    </footer>
->>>>>>> 75deceed14d3e757e09d579692a2bc221bdad696
-
-
 </html>
\ No newline at end of file
diff --git a/index.html b/index.html
index 6240aaf..c489c71 100644
--- a/index.html
+++ b/index.html
@@ -97,45 +97,7 @@
             </form>
         </div>
     </div>
-<<<<<<< HEAD
-    <footer>
-        <table>
-            <tbody>
-            <tr>
-                <th>Accès rapide</th><th></th>
-            </tr>
-            <tr>
-                <td><a href="#">Accueil</a></td>
-                <td><a href="#slider">Nos Promotions</a></td>
-                
-            </tr>
-            <tr>
-                <td><a href="#produits">Nos Produits</a></td>
-                <td><a href="Assets/Pages/Autres/checkout.html">Votre panier</a></td>
-                
-            </tr>
-            </tbody>
-        </table>
-        <h1>Nos réseaux sociaux :</h1>
-        <table id="reseaux">
-            <tr id="res">
-                <td>
-                    <a href="#"><img src="Assets/Images/Icones/facebook.png" alt></a>
-                </td>
-                <td>
-                    <a href="#"><img src="Assets/Images/Icones/twitter.png" alt></a>
-                </td>
-                <td>
-                    <a href="#"><img src="Assets/Images/Icones/yt.png" alt></a>
-                </td>
-                <td>
-                    <a href="#"><img src="Assets/Images/Icones/insta.png" alt></a>
-                </td>
-            </tr>
-        </table>   
-    
-    <footer>
-=======
+
     <div id="nous">
         <div class="title">
             <h1>Qui sommes nous ?</h1>
@@ -188,7 +150,6 @@
         </div>
     </footer>
 
->>>>>>> 75deceed14d3e757e09d579692a2bc221bdad696
 </body>
 
 </html>
\ No newline at end of file