From 0ce7bf29bfa1d9beb5dd81579eac523088ca64dc Mon Sep 17 00:00:00 2001
From: Florine Lefebvre <florine.lefebvre.etu@univ-lille.fr>
Date: Mon, 17 Mar 2025 10:35:34 +0100
Subject: [PATCH] merge
---
WEB-INF/vue/signin.jsp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/WEB-INF/vue/signin.jsp b/WEB-INF/vue/signin.jsp
index a4a21d9..7799817 100644
--- a/WEB-INF/vue/signin.jsp
+++ b/WEB-INF/vue/signin.jsp
@@ -30,11 +30,7 @@
<div>
<div class="mt-2 mb-3">
<p class="mb-1">Pseudonyme</p>
-<<<<<<< HEAD
<input class="form-control" name="username" pattern="[a-zA-Z0-9_.]{3,24}" type="text" placeholder="pmathieu" maxlength="24" required>
-=======
- <input class="form-control" name="username" type="text" placeholder="pmathieu" maxlength="24" pattern="\w{3,24}" required>
->>>>>>> refs/remotes/origin/main
</div>
<div class="mb-3">
<p class="mb-1">Mot de passe</p>
--
GitLab