resolve merge conflict (4a9cae63) · Commits · Scherbaum Maximilian / BattleArena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BattleArena
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4a9cae63

Commit 4a9cae63 authored 1 year ago by Tran Peter

Downloads
- Plain Diff

resolve merge conflict

parents e9012e5d 764a4863

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

README.md 12 additions, 0 deletions

README.md
src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 3 additions, 0 deletions

..._stuttgart/battlearena/Controller/MainMenuController.java
src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java 5 additions, 0 deletions

src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java 4 additions, 1 deletion

...de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/MusicType.java 0 additions, 16 deletions

...a/de/hdm_stuttgart/battlearena/Model/Sound/MusicType.java
src/main/resources/player/appSettings.json 2 additions, 2 deletions

src/main/resources/player/appSettings.json
src/test/java/MusicPlayerTest.java 26 additions, 0 deletions

src/test/java/MusicPlayerTest.java

with 52 additions and 19 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