From 0db1fa1538e22ff391804df79304fcaca1a2b44a Mon Sep 17 00:00:00 2001 From: Jaenai Rugengande Ihimbazwe Date: Fri, 3 Dec 2021 01:27:37 +0100 Subject: [PATCH] Maj temp bateau. --- templates/bateau.html | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/templates/bateau.html b/templates/bateau.html index 78e119c..a079c34 100644 --- a/templates/bateau.html +++ b/templates/bateau.html @@ -1,14 +1,54 @@ +<<<<<<< HEAD + +======= +>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5 {{nom}} +<<<<<<< HEAD + +======= +>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5

{{nom}}}

+<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + +======= @@ -31,6 +71,7 @@ +>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
Nom{{NomBateau}}
Constructeur{{nom}}
Dimensions{{Dimensions}}
Installation{{Date}}
Condamnation{{Date}}
Origine{{ville}}Nom {{NomBateau}}
Origine {{ville}}