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

Revert "merge conflict" 

This reverts commit 93885fd0.
parent c9aab4ed
No related branches found
No related tags found
4 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!17Merge ui into development
Hide whitespace changes
Inline Side-by-side
src/main/java/module-info.java
+ 0
− 1
View file @ e5cfc512
......@@ -19,6 +19,5 @@ module gui {
exports de.hdm_stuttgart.battlearena.Model.Inputs;
exports de.hdm_stuttgart.battlearena.Model.Map;
exports de.hdm_stuttgart.battlearena.Controller.Utilities;
exports de.hdm_stuttgart.battlearena.Model.Multiplayer;
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