Chauntalle Schüle 9ec8158c4e Merge remote-tracking branch 'refs/remotes/origin/60-global-accessible-entitymanager' ... Conflicts: GoldWars/GoldWars/Scenes/GameScene.swift		2020-05-17 19:39:37 +02:00
..
GoldWars	Merge remote-tracking branch 'refs/remotes/origin/60-global-accessible-entitymanager'	2020-05-17 19:39:37 +02:00
GoldWars.xcodeproj	solving merge conflicts	2020-05-16 19:12:10 +02:00
GoldWarsTests	Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"	2020-05-11 19:58:15 +02:00