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] 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;
     }
+
 }