From 7be5700359979ff5283f0f806f32982fdee9573c Mon Sep 17 00:00:00 2001
From: jojo <yoyosource@nidido.de>
Date: Wed, 27 Jan 2021 09:51:14 +0100
Subject: [PATCH] Fix merge conflicts

---
 .../src/de/steamwar/bausystem/commands/CommandFreeze.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
index 507c454..53d6395 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
@@ -16,7 +16,6 @@
  *
  *     You should have received a copy of the GNU Affero General Public License
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * /
  */
 
 package de.steamwar.bausystem.commands;