Johannes Schmelz 2d9cd0e4e1 resolve merge conflict

2024-11-29 06:17:57 +01:00

..

client

resolve merge conflict

2024-11-29 06:17:57 +01:00

model

Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui

2024-11-29 04:41:14 +01:00

server

rudimentary function for trade

2024-11-29 03:07:17 +01:00

run-mac.sh

init for monopoly

2024-11-12 14:53:04 +01:00

run.sh

init for monopoly

2024-11-12 14:53:04 +01:00