Skip to content
Snippets Groups Projects
Commit 93885fd0 authored by Tran Peter's avatar Tran Peter
Browse files

merge conflict

parent ba8dee5b
No related branches found
No related tags found
5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!10Mergin ui into development,!9Merging ui into development
Hide whitespace changes
Inline Side-by-side
src/main/java/module-info.java
+ 1
− 0
View file @ 93885fd0
...@@ -13,5 +13,6 @@ module gui { ...@@ -13,5 +13,6 @@ module gui {
exports de.hdm_stuttgart.battlearena.Model.Inputs; exports de.hdm_stuttgart.battlearena.Model.Inputs;
exports de.hdm_stuttgart.battlearena.Model.Map; exports de.hdm_stuttgart.battlearena.Model.Map;
exports de.hdm_stuttgart.battlearena.Controller.Utilities; exports de.hdm_stuttgart.battlearena.Controller.Utilities;
exports de.hdm_stuttgart.battlearena.Model.Multiplayer;
opens de.hdm_stuttgart.battlearena.Controller.Utilities to javafx.fxml; opens de.hdm_stuttgart.battlearena.Controller.Utilities to javafx.fxml;
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment