From 5ebec6b0268a887cde2b85b42049d073bc8832f7 Mon Sep 17 00:00:00 2001
From: "elliass.chelloug" <elliass.chelloug@sio211-08.sio.lan>
Date: Mon, 18 Oct 2021 17:22:27 +0200
Subject: [PATCH] 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 6e51da6..8a297ef 100644
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@@ -21,7 +21,7 @@
</p>
</fieldset>
</form>
- <br /><br />
+ <br /><br />
</div>