From f4faabc87cd66d95db0e0218b98696be062d483f Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 18 Oct 2017 06:27:40 -0500
Subject: [PATCH] Update mind.dm

---
 code/datums/mind.dm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 3437e188ed..319a235587 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1435,19 +1435,6 @@
 	add_antag_datum(head)
 	special_role = "Head Revolutionary"
 
-<<<<<<< HEAD
-	SSticker.mode.forge_revolutionary_objectives(src)
-	SSticker.mode.greet_revolutionary(src,0)
-
-	var/list/L = current.get_contents()
-	var/obj/item/device/assembly/flash/flash = locate() in L
-	qdel(flash)
-	take_uplink()
-	var/fail = 0
-	fail |= !SSticker.mode.equip_revolutionary(current)
-		
-=======
->>>>>>> bfc5a2c... Datum rev & related upgrades to base datum antag (#31630)
 /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S)
 	spell_list += S
 	S.action.Grant(current)