from hedi

.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">

.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>

.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>

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;

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
-