From d8c25f656b083f5bb24c63fc615b33354bedf01e Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 12 Nov 2017 08:56:53 -0600
Subject: [PATCH] Update admin_investigate.dm

---
 code/modules/admin/admin_investigate.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index bb2a72f970..a5e9119b5d 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -2,11 +2,7 @@
 	if(!message || !subject)
 		return
 	var/F = file("[GLOB.log_directory]/[subject].html")
-<<<<<<< HEAD
-	F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
-=======
 	WRITE_FILE(F, "<small>[time_stamp()] [REF(src)] ([x],[y],[z])</small> || [src] [message]<br>")
->>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental
 
 
 /client/proc/investigate_show(subject in list("hrefs","notes, memos, watchlist", INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS) )