From 010c1e17ad377e9e47d7c597d853d12636c8ff9d Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 29 Dec 2017 18:38:32 -0600
Subject: [PATCH] Update client_procs.dm

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

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index c5385b2abb..facfe599c4 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -75,12 +75,8 @@
 
 	//Logs all hrefs, except chat pings
 	if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
-<<<<<<< HEAD
-		WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
-=======
 		WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr]\[[COORD(usr)]\])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
 
->>>>>>> 0687e88... Merge pull request #33835 from kevinz000/patch-415
 	// Admin PM
 	if(href_list["priv_msg"])
 		cmd_admin_pm(href_list["priv_msg"],null)