nettoyage
This commit is contained in:
parent
811a3efb94
commit
e4c274d08c
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
</head>
|
||||
<body class="page-accueil"><<<<<<< HEAD
|
||||
<body>
|
||||
<title>Ma monnaie libre</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
|
||||
|
@ -44,6 +44,6 @@
|
|||
<p><img src="img/qrcodeg1cotiz.png" alt="Clef publique d'Attilax"></p>
|
||||
<p>site publié sous licence libre CC-By-SA</p>
|
||||
</footer>
|
||||
>>>>>>> 4ee4ea682ea20d9821300acfab37756f7574ed08
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
</head>
|
||||
<body class="page-accueil"><<<<<<< HEAD
|
||||
<body>
|
||||
<title>Ma monnaie libre</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
|
||||
|
@ -44,6 +44,6 @@
|
|||
<p><img src="img/qrcodeg1cotiz.png" alt="Clef publique d'Attilax"></p>
|
||||
<p>site publié sous licence libre CC-By-SA</p>
|
||||
</footer>
|
||||
>>>>>>> 4ee4ea682ea20d9821300acfab37756f7574ed08
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Reference in New Issue