diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d3352..a4c86a9 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,11 @@ # Default ignored files /shelf/ /workspace.xml +<<<<<<< HEAD +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +======= +>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11 diff --git a/.idea/Organizee.iml b/.idea/Organizee.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Organizee.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 06e8b35..53931a6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11 \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c487121 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..b24858b 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,10 @@ +<<<<<<< HEAD + +======= +>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11 \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..58bb4c0 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# Organizee \ 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 7762877..a3a0d96 100644 --- a/src/main/java/fr/organizee/model/Membre.java +++ b/src/main/java/fr/organizee/model/Membre.java @@ -14,6 +14,7 @@ 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;