# Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/FoodFieldCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GateFieldCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java # Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java