Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java
This commit is contained in:
elliass.chelloug 2021-10-22 12:38:08 +02:00
parent 30e988a406
commit 0d1d4385f9
2 changed files with 2 additions and 3 deletions

View File

@ -33,5 +33,4 @@
</table> </table>
</fieldset> </fieldset>
<input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification"> <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">
</html> </html>

View File

@ -9,7 +9,7 @@ and open the template in the editor.
*/ */
body body
{ {
background-color: #e2e7e9; background-color: #596b6e;
background-repeat: repeat-x; background-repeat: repeat-x;
margin:0% 0%; margin:0% 0%;
padding : 0.9em; padding : 0.9em;