From c12222a047416dd657adf19988fe62ca61a896d5 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Mon, 13 Dec 2021 14:33:19 +0100
Subject: [PATCH] from hedi

---
 .idea/compiler.xml                           | 4 ----
 .idea/misc.xml                               | 4 ----
 .idea/vcs.xml                                | 4 ----
 pom.xml                                      | 2 +-
 src/main/java/fr/organizee/model/Membre.java | 2 +-
 src/main/resources/application.properties    | 1 -
 6 files changed, 2 insertions(+), 15 deletions(-)

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 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="organizee" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="organizee" target="11" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-<<<<<<< HEAD
-  <component name="ProjectRootManager">
-=======
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
@@ -12,7 +9,6 @@
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
->>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-<<<<<<< HEAD
-    <mapping directory="" vcs="Git" />
-=======
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
->>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
   </component>
 </project>
\ 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 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ 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
-