resolve merge conflict (9305b42e) · 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

9305b42e

Commit 9305b42e authored 1 year ago by Tran Peter

Downloads
- Plain Diff

resolve merge conflict

parents 283ac21d c199756f

No related branches found

No related tags found

4 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!17Merge ui into development

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java 24 additions, 22 deletions

...rt/battlearena/Model/DataStorage/Classes/Persistence.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 3 additions, 4 deletions

...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java 2 additions, 2 deletions

...ttlearena/Model/DataStorage/Classes/Utilities/Parser.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql 2 additions, 2 deletions

...tlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql 2 additions, 2 deletions

...ttlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql
src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java 5 additions, 5 deletions

...arena/Model/DataStorage/Classes/Utilities/ParserTest.java

with 38 additions and 37 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