christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into entadminisierung

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/User.java
#	src/main/resources/templates/editMembers.html
This commit is contained in:
Lukas Ettel
2020-03-19 16:14:57 +01:00
parent cf46a549dc d9388c282c
commit a96981515f
10 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/mops/gruppen2/domain/User.java
View File

@ -11,8 +11,8 @@ import lombok.NoArgsConstructor;
@EqualsAndHashCode(exclude = {"givenname", "familyname", "email"})
public class User {
private String id;
private String givenname;
private String familyname;
private String email;
private String id;
private String givenname;
private String familyname;
private String email;
}