From aec1142ca1b40c467f88f0848eff2a48c234caf7 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 24 Dec 2017 02:38:37 -0600
Subject: [PATCH] Update _eminence.dm

---
 code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
index 3728520e82..f232ba3def 100644
--- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
+++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
@@ -47,8 +47,6 @@
 /mob/camera/eminence/Login()
 	..()
 	add_servant_of_ratvar(src, TRUE)
-<<<<<<< HEAD
-=======
 	var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
 	if(C && C.clock_team)
 		if(C.clock_team.eminence)
@@ -57,7 +55,6 @@
 			return
 		else
 			C.clock_team.eminence = src
->>>>>>> 3b37dae... (probably?) Fixes being able to create two Eminences at a time + other Eminence issues (#33634)
 	to_chat(src, "<span class='bold large_brass'>You have been selected as the Eminence!</span>")
 	to_chat(src, "<span class='brass'>As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.</span>")
 	to_chat(src, "<span class='brass'>Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.</span>")