Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into BACKUP2
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	src/main/java/model/service/user/UserRegistry.java
  • Loading branch information
r-monti committed Jan 23, 2024
2 parents 7ca4ad6 + f4f7be2 commit 6195941
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
Empty file modified mvnw
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/main/java/model/service/user/UserRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public UserRegistry(DAOPersonalInfo db) {
this.db = db;
}

public boolean firstAccess(int id, String name, String surname) {//TODO e da inserire nel metodo di registrazione!
public boolean firstAccess(int id, String name, String surname) {
return db.createRegistry(id, name, surname);
}

Expand Down

0 comments on commit 6195941

Please sign in to comment.