08.01.2024 - fix merge conflicts (99be5327) · Commits · Schneider Stefan / student-tournament-hub · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

student-tournament-hub
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

99be5327

Commit 99be5327 authored 1 year ago by Jonas

Downloads
- Plain Diff

08.01.2024 - fix merge conflicts

parents ae3f2e8f 468bf62c

No related branches found

No related tags found

1 merge request!7Dev in Main Merge

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

sth-backend/src/main/java/hdm/mi/sthbackend/controller/TournamentController.java 6 additions, 0 deletions

...va/hdm/mi/sthbackend/controller/TournamentController.java
sth-backend/src/main/java/hdm/mi/sthbackend/exeptions/MatchIdNotFoundException.java 10 additions, 0 deletions

...hdm/mi/sthbackend/exeptions/MatchIdNotFoundException.java
sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java 61 additions, 7 deletions

...ain/java/hdm/mi/sthbackend/service/TournamentService.java

with 77 additions and 7 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