From 49a96143a6777cd36f8179cd59b9e81286358acc Mon Sep 17 00:00:00 2001 From: batikano1 Date: Fri, 3 Dec 2021 06:07:41 +0100 Subject: [PATCH] debugging --- templates/expedition.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/templates/expedition.html b/templates/expedition.html index fd4372e..3272eb7 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -1,5 +1,5 @@ -<<<<<<< HEAD + -======= ->>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e + + {{nom}}- Sauveteurs du dunkerquois {% include 'head.html' %} -<<<<<<< HEAD + {% include "smallheader.html" %}

{{nom}}

@@ -32,9 +32,7 @@ histoire -======= - {% include "smallheader.html" %} -

{{siecle}}

+ ->>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e +