From 4c550380b67dc13e1d4860f572eb822efb7802e9 Mon Sep 17 00:00:00 2001 From: Antoine Waehren Date: Fri, 3 Dec 2021 01:30:56 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20probl=C3=A8mes=20avec=20temp=20bat?= =?UTF-8?q?eau.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/bateau.html | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/templates/bateau.html b/templates/bateau.html index a079c34..3913bc5 100644 --- a/templates/bateau.html +++ b/templates/bateau.html @@ -1,5 +1,4 @@ -<<<<<<< HEAD -======= ->>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5 - {{nom}} -<<<<<<< HEAD -======= ->>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5

{{nom}}}

-<<<<<<< HEAD @@ -48,7 +40,6 @@ histoire -======= @@ -71,7 +62,6 @@ histoire ->>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
Nom {{NomBateau}}
Origine {{ville}}Nom {{NomBateau}}
Origine {{ville}}

@@ -79,4 +69,4 @@ histoire

- \ No newline at end of file +