Merge origin/master
Conflicts: src/java/bdd/PompierMysql.java
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
|
||||
<head>
|
||||
<<link rel="stylesheet" href="css/newcss.css"/>
|
||||
<title>SDIS29</title>
|
||||
</head>
|
||||
<div id="page">
|
||||
<div id="entete">
|
||||
<img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" align='left' style="width: 200px; height: 180px" />
|
||||
<!-- fin de l'ent<6E>te -->
|
||||
<img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" align='left' style="width: 200px; height: 180px";
|
||||
}/>
|
||||
<!-- fin de l'ent<6E>te -->
|
||||
|
Reference in New Issue
Block a user