Conflicts: src/java/bdd/PompierMysql.java src/java/com/test/servlets/AuthentifServlet.java web/WEB-INF/AuthentificationJSP.jsp web/WEB-INF/ProfilJSP.jsp
Conflicts: src/java/bdd/PompierMysql.java src/java/com/test/servlets/AuthentifServlet.java web/WEB-INF/AuthentificationJSP.jsp web/WEB-INF/ProfilJSP.jsp