diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8793a57..a8c4885 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,12 +6,8 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 53931a6..06e8b35 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ -<<<<<<< HEAD - -======= @@ -12,7 +9,6 @@ ->>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11 \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index b24858b..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,10 +1,6 @@ -<<<<<<< HEAD - -======= ->>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11 \ No newline at end of file diff --git a/pom.xml b/pom.xml index f417ba8..32eb628 100644 --- a/pom.xml +++ b/pom.xml @@ -51,4 +51,4 @@ - + \ No newline at end of file diff --git a/src/main/java/fr/organizee/model/Membre.java b/src/main/java/fr/organizee/model/Membre.java index a3a0d96..c99664f 100644 --- a/src/main/java/fr/organizee/model/Membre.java +++ b/src/main/java/fr/organizee/model/Membre.java @@ -3,6 +3,7 @@ package fr.organizee.model; import javax.persistence.*; import java.time.LocalDate; + @Entity public class Membre { @Id @@ -14,7 +15,6 @@ public class Membre { private String email; private String password; private String isAdmin; - private String testGit; @ManyToOne(fetch= FetchType.EAGER) @JoinColumn(name="TEAM_ID") private Team team; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 810eee5..1c67b23 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,4 +20,3 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial # Permet d'exécuter le data.sql # =============================== ## spring.datasource.initialization-mode=always -