From 9a734772a901bcd958536505d365921873791762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20Gu=C3=A9don?=
 <60623551+arthurgdn@users.noreply.github.com>
Date: Wed, 9 Dec 2020 22:55:13 +0100
Subject: [PATCH] Update student-signup.component.html (#62)

---
 src/app/signup/student-signup/student-signup.component.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index bd096f8..c567456 100644
--- a/src/app/signup/student-signup/student-signup.component.html
+++ b/src/app/signup/student-signup/student-signup.component.html
@@ -33,10 +33,7 @@
       </mat-hint>
     </mat-form-field>
 
-<<<<<<< HEAD
 
-=======
->>>>>>> donnees_personnelles
     <p>
       Il ne te reste plus qu'à choisir un mot de passe. :-)
     </p>
@@ -67,4 +64,4 @@
       J'ai déjà un compte ! <a routerLink="/connexion">Me connecter</a>
     </p>
   </form>
-</app-form-page>
\ No newline at end of file
+</app-form-page>
-- 
GitLab