From 5b15718346e4df9a284c4af995ed39051fa9faca Mon Sep 17 00:00:00 2001 From: "funcha.ahamadi" Date: Fri, 22 Oct 2021 12:54:02 +0200 Subject: [PATCH] Merge origin/master Conflicts: src/java/bdd/PompierMySql.java src/java/com/test/servlets/authentifServlet.java web/WEB-INF/CreaPompier.jsp --- web/WEB-INF/accueilJSP.jsp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/WEB-INF/accueilJSP.jsp b/web/WEB-INF/accueilJSP.jsp index 0331fc9..ed7a3dd 100644 --- a/web/WEB-INF/accueilJSP.jsp +++ b/web/WEB-INF/accueilJSP.jsp @@ -9,6 +9,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> + +
Authentification