CretinsMotorisesIngenieux
/
Marin
5
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

debugging

This commit is contained in:
batikano1 2021-12-03 06:07:41 +01:00
parent 3513a02f52
commit 49a96143a6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/expedition.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<<<<<<< HEAD
<!--- Variables <!--- Variables
nom nom
prenom prenom
@ -8,14 +8,14 @@ place
histoire histoire
!--> !-->
<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html --> <!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
=======
>>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e
<html><head> <html><head>
<title>{{nom}}- Sauveteurs du dunkerquois</title> <title>{{nom}}- Sauveteurs du dunkerquois</title>
{% include 'head.html' %} {% include 'head.html' %}
</head> </head>
<body> <body>
<<<<<<< HEAD
{% include "smallheader.html" %} {% include "smallheader.html" %}
<h1>{{nom}}</h1> <h1>{{nom}}</h1>
<div class="flexbox"> <div class="flexbox">
@ -32,9 +32,7 @@ histoire
</tr> </tr>
</tbody></table> </tbody></table>
=======
{% include "smallheader.html" %}
<h1>{{siecle}}</h1>
</body> </body>
</html> </html>
>>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e