From c9f0f4923f6e23dd4e120ff7bc0f560201295721 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:34:09 -0500
Subject: [PATCH] Update rdconsole.dm

---
 code/modules/research/rdconsole.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 165a5dc6f6..d79b5d5eb8 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -148,19 +148,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 
 /obj/machinery/computer/rdconsole/emag_act(mob/user)
-<<<<<<< HEAD
-	if(emagged)
-		return
-	playsound(src, "sparks", 75, 1)
-	emagged = TRUE
-	to_chat(user, "<span class='notice'>You disable the security protocols</span>")
-=======
 	if(!emagged)
 		to_chat(user, "<span class='notice'>You disable the security protocols</span>")
 		playsound(src, "sparks", 75, 1)
 		emagged = TRUE
 	return ..()
->>>>>>> 1148c49... fixes emagging (#33065)
 
 /obj/machinery/computer/rdconsole/Topic(href, href_list)
 	if(..())