From a0deb7531894201573be4012ecc012f3ee1e947d Mon Sep 17 00:00:00 2001
From: "thomas.millot" <thomas.millot@sio211-07.sio.lan>
Date: Mon, 18 Oct 2021 17:00:27 +0200
Subject: [PATCH 1/2] Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
---
 web/WEB-INF/AuthentificationJSP.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/WEB-INF/AuthentificationJSP.jsp b/web/WEB-INF/AuthentificationJSP.jsp
index 760af3e..f042e47 100644
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@@ -21,6 +21,6 @@
             </p>
         </fieldset>
 	</form>
-    <br /><br />
+    <br /><br/>
 </div>
 

From d13cdc2f75e00322eb54991369f9bc8db35cdb46 Mon Sep 17 00:00:00 2001
From: "thomas.millot" <thomas.millot@sio211-07.sio.lan>
Date: Mon, 18 Oct 2021 17:01:46 +0200
Subject: [PATCH 2/2] Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
---
 src/java/bdd/PompierMysql.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/java/bdd/PompierMysql.java b/src/java/bdd/PompierMysql.java
index 88e039d..f80c474 100644
--- a/src/java/bdd/PompierMysql.java
+++ b/src/java/bdd/PompierMysql.java
@@ -155,4 +155,5 @@ public class PompierMysql {
         }        
         return id;
     }
+
 }