Update client_procs.dm

2017-10-07 22:45:04 -05:00
parent 91aa560f0d
commit 661c2d293b
1 changed files with 0 additions and 3 deletions
@@ -351,11 +351,8 @@ GLOBAL_LIST(external_rsc_urls)
 		if (menuitem)
 			menuitem.Load_checked(src)

-<<<<<<< HEAD
 	hook_vr("client_new",list(src))
-=======
 	Master.UpdateTickRate()
->>>>>>> bc4d4e7... Merge pull request #31374 from MrStonedOne/highpopmode

 //////////////
 //DISCONNECT//