From 07e6ff67d80cf1506b825cd48b7ecdf77f4b5136 Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Thu, 27 Sep 2018 20:34:38 +0200
Subject: [PATCH] Resolve merge conflicts 2

---
 Server/Events/Connect.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Server/Events/Connect.cs b/Server/Events/Connect.cs
index 4e60560a..04555ca5 100644
--- a/Server/Events/Connect.cs
+++ b/Server/Events/Connect.cs
@@ -40,7 +40,6 @@ namespace reallife_gamemode.Server.Events
 
             }
         }
-<<<<<<< HEAD
         [RemoteEvent("IsPlayerBanned")]
         public void IsPlayerBanned(Client player)
         {
@@ -71,8 +70,5 @@ namespace reallife_gamemode.Server.Events
                 else player.TriggerEvent("showLogin");
             }
         }
-
-=======
->>>>>>> 93818ed28ddf5427bc20581af533e442290ed7e0
     }
 }
\ No newline at end of file