From f220aeb78c9135043b0f0dee0d44f2692a888096 Mon Sep 17 00:00:00 2001
From: Johannes Schmelz <johannes.schmelz@unibw.de>
Date: Sun, 1 Dec 2024 21:42:05 +0100
Subject: [PATCH] resolve merge

---
 .../client/src/main/java/pp/monopoly/client/gui/TestWorld.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java
index 10e3eb1..8e2ef9c 100644
--- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java
+++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java
@@ -17,7 +17,9 @@ import pp.monopoly.client.gui.popups.ConfirmTrade;
 import pp.monopoly.client.gui.popups.EventCardPopup;
 import pp.monopoly.client.gui.popups.FoodFieldCard;
 import pp.monopoly.client.gui.popups.GateFieldCard;
+import pp.monopoly.client.gui.popups.Gulag;
 import pp.monopoly.client.gui.popups.LooserPopUp;
+import pp.monopoly.client.gui.popups.NoMoneyWarning;
 import pp.monopoly.client.gui.popups.TimeOut;
 import pp.monopoly.client.gui.popups.WinnerPopUp;
 import pp.monopoly.game.server.Player;