Resolve merge conflicts 2

2018-09-27 20:34:38 +02:00
parent 3afa1f1c41
commit 07e6ff67d8
1 changed files with 0 additions and 4 deletions
--- 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
    }
 }