From 6ee0b4fc73992138c37ffc8fa605e6d8027aa519 Mon Sep 17 00:00:00 2001
From: rawer470 <timont60@bk.ru>
Date: Fri, 16 Aug 2024 10:41:25 +0300
Subject: [PATCH] ServerConflictUpdate

---
 ZoFo/GameCore/Server.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ZoFo/GameCore/Server.cs b/ZoFo/GameCore/Server.cs
index 02d7e05..2d520ce 100644
--- a/ZoFo/GameCore/Server.cs
+++ b/ZoFo/GameCore/Server.cs
@@ -47,15 +47,9 @@ namespace ZoFo.GameCore
         {
             UpdateGameEnded gameEnded = new UpdateGameEnded();
             networkManager.AddData(gameEnded);
-<<<<<<< Updated upstream
             networkManager.CloseConnection();
         } 
-        internal void Update(GameTime gameTime)
-=======
-        }
-
-        public void Update(GameTime gameTime)
->>>>>>> Stashed changes
+       public void Update(GameTime gameTime)
         { 
         }