Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

idatt1002_2022_K1-G4
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

5ea6f2f2

Commit 5ea6f2f2 authored 3 years ago by Callum Gran

Downloads
- Plain Diff

Merge branch 'fix/team-in-multiple-divisions' into 'main'

fix(teamDAO): teams can now be in multiple divisions

See merge request carljgu/tournament-service!137

parents fe7fa367 a9da221d

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/edu/ntnu/idatt1002/k1g4/Match.java 0 additions, 1 deletion

src/main/java/edu/ntnu/idatt1002/k1g4/Match.java
src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java 1 addition, 1 deletion

src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java
src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java 20 additions, 2 deletions

src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
src/test/java/edu/ntnu/idatt1002/k1g4/MatchDAOTest.java 0 additions, 1 deletion

src/test/java/edu/ntnu/idatt1002/k1g4/MatchDAOTest.java
src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java 1 addition, 1 deletion

src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java

with 22 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment