From bb171d4bcac66399cbc1c3a435b205647702ec13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20Gu=C3=A9don?=
 <60623551+arthurgdn@users.noreply.github.com>
Date: Wed, 7 Oct 2020 11:36:17 +0200
Subject: [PATCH] closes three-panes tag (#52)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* adds support for personnal data

* modifie le form pour inclure la nationalité

* supprime le gg form

* supprime le champ section et ajoute la liste des etablissements

* adapts for user

* adds validation and connects to students api for personnal data

* adds classType field and rgpd info

* corrects scholarships

* removes signup file tab

* minor presentation changes

* deletes random console.log

* changes upload component declarations

* changes upload component declarations

* changes upload component declarations

* changes upload component declarations

* changes upload component declarations

* changes upload component declarations

* changes upload component declarations

* filters if the whole list is sent back

* adds message after personnal data modifications

* adds message after user modifies personal data

* adds message after user modifies personal data
---
 src/app/members/student-home/student-home.component.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/members/student-home/student-home.component.html b/src/app/members/student-home/student-home.component.html
index f5adf02..540c5f1 100644
--- a/src/app/members/student-home/student-home.component.html
+++ b/src/app/members/student-home/student-home.component.html
@@ -12,11 +12,7 @@
   <app-pane id="account">
     <account-overview class="pane-content"></account-overview>
   </app-pane>
-<<<<<<< HEAD
-</app-two-panes>
-=======
 </app-three-panes>
->>>>>>> donnees_personnelles
 
 <div class="container">
   <h2>
-- 
GitLab