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

Correction problèmes avec temp bateau.

This commit is contained in:
Antoine Waehren 2021-12-03 01:30:56 +01:00
parent 374410a792
commit 4c550380b6
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/bateau.html
View File

@ -1,5 +1,4 @@
<!DOCTYPE html> <!DOCTYPE html>
<<<<<<< HEAD
<!--- Variables <!--- Variables
nom nom
constructeur constructeur
@ -9,23 +8,16 @@ condamnation
origine origine
histoire histoire
!--> !-->
=======
>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>{{nom}}</title> <title>{{nom}}</title>
<<<<<<< HEAD
<link href="../static/style.css" rel="stylesheet" type="text/css"> <link href="../static/style.css" rel="stylesheet" type="text/css">
=======
<link href="file:///C:/Users/rugja/Marin/templates/style.css" rel="stylesheet" type="text/css"> <link href="file:///C:/Users/rugja/Marin/templates/style.css" rel="stylesheet" type="text/css">
>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
</head> </head>
<body> <body>
<h1>{{nom}}}</h1> <h1>{{nom}}}</h1>
<table> <table>
<tbody><tr> <tbody><tr>
<<<<<<< HEAD
<td>Nom</td> <td>Nom</td>
<td>{{NomBateau}}</td> <td>{{NomBateau}}</td>
</tr> </tr>
@ -48,7 +40,6 @@ histoire
<tr> <tr>
<td>Origine</td> <td>Origine</td>
<td>{{ville}}</td> <td>{{ville}}</td>
=======
<th>Nom</th> <th>Nom</th>
<th>{{NomBateau}}</th> <th>{{NomBateau}}</th>
</tr> </tr>
@ -71,7 +62,6 @@ histoire
<tr> <tr>
<th>Origine</th> <th>Origine</th>
<th>{{ville}}</th> <th>{{ville}}</th>
>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
</tr> </tr>
</tbody></table> </tbody></table>
<p> <p>
@ -79,4 +69,4 @@ histoire
</p> </p>
</body></html> </body></html>