aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve merge conflicts 2

Browse Source
This commit is contained in:
VegaZ
2018-09-27 20:34:38 +02:00
parent 3afa1f1c41
commit 07e6ff67d8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Server/Events/Connect.cs
View File

@@ -40,7 +40,6 @@ namespace reallife_gamemode.Server.Events
} }
} }
<<<<<<< HEAD
[RemoteEvent("IsPlayerBanned")] [RemoteEvent("IsPlayerBanned")]
public void IsPlayerBanned(Client player) public void IsPlayerBanned(Client player)
{ {
@@ -71,8 +70,5 @@ namespace reallife_gamemode.Server.Events
else player.TriggerEvent("showLogin"); else player.TriggerEvent("showLogin");
} }
} }
=======
>>>>>>> 93818ed28ddf5427bc20581af533e442290ed7e0
} }
} }