From 661c2d293b69e4399476fe115a873d1c8a9d96eb Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 7 Oct 2017 22:45:04 -0500
Subject: [PATCH] Update client_procs.dm

---
 code/modules/client/client_procs.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 8e8361194d..e755ff28ac 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -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//