From b85bf7feb82b9906210b5b01eeddb36926b56115 Mon Sep 17 00:00:00 2001
From: Restart2008 <restart.openfront@gmail.com>
Date: Sat, 25 Oct 2025 11:03:57 -0700
Subject: [PATCH] Update WinCheckExecution.ts

---
 src/core/execution/WinCheckExecution.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/core/execution/WinCheckExecution.ts b/src/core/execution/WinCheckExecution.ts
index 66646d3b1..d5a460bea 100644
--- a/src/core/execution/WinCheckExecution.ts
+++ b/src/core/execution/WinCheckExecution.ts
@@ -31,11 +31,7 @@ export class WinCheckExecution implements Execution {
 
     if (this.mg.config().gameConfig().gameMode === GameMode.FFA) {
       this.checkWinnerFFA();
-<<<<<<< Updated upstream
-    } else {
-=======
     } else if (gameMode === GameMode.NukeWars || gameMode === GameMode.Team) {
->>>>>>> Stashed changes
       this.checkWinnerTeam();
     }
   }