fixed merge conflicts

2025-09-26 17:01:45 +02:00
parent 8f6634b03f
commit 8980d98394
14 changed files with 3 additions and 588 deletions
@@ -31,13 +31,7 @@ export enum ConsequenceType {
    MOVE_BACKWARD = 1,
    LOSE_TURN = 2,
    EXTRA_TURN = 3,
-<<<<<<< HEAD
    GO_TO_START = 5
-=======
-    SWAP_POSITION = 4,
-    GO_TO_START = 5,
-    TURN_AGAIN = 6
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 }

 export interface Consequence {