chore: resolved a huge merge conflict
This commit is contained in:
@@ -27,6 +27,10 @@ GET /game/:id controllers.IngameController.game(id: String
|
||||
GET /game/:id/join controllers.IngameController.joinGame(id: String)
|
||||
GET /game/:id/start controllers.IngameController.startGame(id: String)
|
||||
POST /game/:id/kickPlayer controllers.IngameController.kickPlayer(id: String, playerId: String)
|
||||
|
||||
POST /game/:id/trump controllers.IngameController.playTrump(id: String)
|
||||
POST /game/:id/tie controllers.IngameController.playTie(id: String)
|
||||
|
||||
GET /game/:id/leaveGame controllers.IngameController.leaveGame(id: String)
|
||||
POST /game/:id/playCard controllers.IngameController.playCard(id: String)
|
||||
# Polling
|
||||
|
||||
Reference in New Issue
Block a user