From 93885fd04e71e66e270b140787723175d2dc92f0 Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Tue, 9 Jan 2024 20:57:37 +0100
Subject: [PATCH] merge conflict
---
src/main/java/module-info.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 8a313280..e154cc03 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -13,5 +13,6 @@ 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
--
GitLab