IUT_Informatique/KyFlo
Archived
1
0
Fork 0
Code Activity

fix bug commit

Browse source
This commit is contained in:
KEZEL BENOIT p1907091 2019-12-16 13:12:12 +01:00
parent c6776e20ba
commit cd102bf8d1
2 changed files with 3 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Assets/Pages/Autres/checkout.html
View file

@ -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>

41
index.html
View file

@ -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>