debugging
This commit is contained in:
parent
3513a02f52
commit
49a96143a6
@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<<<<<<< HEAD
|
||||
|
||||
<!--- Variables
|
||||
nom
|
||||
prenom
|
||||
@ -8,14 +8,14 @@ place
|
||||
histoire
|
||||
!-->
|
||||
<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
|
||||
=======
|
||||
>>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e
|
||||
|
||||
|
||||
<html><head>
|
||||
<title>{{nom}}- Sauveteurs du dunkerquois</title>
|
||||
{% include 'head.html' %}
|
||||
</head>
|
||||
<body>
|
||||
<<<<<<< HEAD
|
||||
|
||||
{% include "smallheader.html" %}
|
||||
<h1>{{nom}}</h1>
|
||||
<div class="flexbox">
|
||||
@ -32,9 +32,7 @@ histoire
|
||||
</tr>
|
||||
|
||||
</tbody></table>
|
||||
=======
|
||||
{% include "smallheader.html" %}
|
||||
<h1>{{siecle}}</h1>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
>>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user