Merge origin/master

Conflicts: src/java/bdd/PompierMysql.java
2021-10-22 12:38:08 +02:00
parent 30e988a406
commit 0d1d4385f9
2 changed files with 2 additions and 3 deletions
--- a/web/WEB-INF/ModifProfilJSP.jsp
+++ b/web/WEB-INF/ModifProfilJSP.jsp
@@ -32,6 +32,5 @@
                    <tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp"  size="20" maxlength="30"></td></tr>
                </table>
            </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>