fixed merge conflicts

2025-09-26 17:01:45 +02:00
parent 8f6634b03f
commit 8980d98394
14 changed files with 3 additions and 588 deletions
@@ -64,11 +64,7 @@ export class StartGameCommandHandler {
                gamecode,
                maxplayers: command.maxplayers,
                logintype: command.logintype,
-<<<<<<< HEAD
                createdby: command.userid!,
-=======
-                createdby: command.userid || null,
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
                orgid: command.orgid || null,
                gamedecks,
                players: [],