From 6c59d4134a98923ea781293d9a952f2087069e10 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Dec 2017 13:31:24 -0600
Subject: [PATCH] Update ritual.dm

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

diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 8a41741227..30e78ff1af 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -265,12 +265,7 @@ This file contains the arcane tome files.
 	if(locate(/obj/effect/rune) in T)
 		to_chat(user, "<span class='cult'>There is already a rune here.</span>")
 		return FALSE
-
-<<<<<<< HEAD
-	if(!(T.z in GLOB.station_z_levels) && T.z != ZLEVEL_MINING)
-=======
 	if(!is_station_level(T.z) && !is_mining_level(T.z))
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 		to_chat(user, "<span class='warning'>The veil is not weak enough here.</span>")
 		return FALSE