fixed merge conflicts

2025-09-26 17:01:45 +02:00
parent 8f6634b03f
commit 8980d98394
14 changed files with 3 additions and 588 deletions
@@ -262,14 +262,6 @@ export class WebSocketService {
        socket.on('chat:archive:delete', (data: DeleteChatArchiveData) => this.handleDeleteChatArchive(socket, data));
        socket.on('message:delete', (data: DeleteMessageData) => this.handleDeleteMessage(socket, data));
        
-<<<<<<< HEAD
-=======
-        // Game event handlers (prepared for future implementation)
-        socket.on('game:join', (data: JoinGameRoomData) => this.handleJoinGameRoom(socket, data));
-        socket.on('game:leave', (data: LeaveGameRoomData) => this.handleLeaveGameRoom(socket, data));
-        socket.on('game:action', (data: GameActionData) => this.handleGameAction(socket, data));
-        
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
        socket.on('disconnect', () => this.handleDisconnection(socket));
    }