merge

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>