mirror of
https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git
synced 2024-11-29 03:09:46 +01:00
6e5d9452b3
# Conflicts: # Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy # Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java # Projekte/monopoly/model/src/test/java/pp/monopoly/client/ClientLogicTest.java # Projekte/monopoly/model/src/test/java/pp/monopoly/game/client/ClientGameLogicTest.java |
||
---|---|---|
.. | ||
src/main | ||
build.gradle | ||
client.properties | ||
logging.properties |