From a16099758789bb321105dfcea385be300a3152dd Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Dec 2017 13:32:02 -0600
Subject: [PATCH] Update talisman.dm

---
 code/game/gamemodes/cult/talisman.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index 898d6bc460..855dfa7255 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -65,13 +65,8 @@
 		log_game("Teleport talisman failed - no other teleport runes")
 		return ..(user, 0)
 
-<<<<<<< HEAD
-	if(user.z > ZLEVEL_SPACEMAX)
-		to_chat(user, "<span class='cultitalic'>You are not in the right dimension!</span>")
-=======
 	if(is_away_level(user.z))
 		to_chat(user, "<span class='cult italic'>You are not in the right dimension!</span>")
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 		log_game("Teleport talisman failed - user in away mission")
 		return ..(user, 0)