From 9eb78791a91a1c7f2fe4d43a232e7d802753b8f6 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 25 Dec 2017 22:53:44 -0600
Subject: [PATCH] Update aux_base.dm

---
 code/modules/mining/aux_base.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index aed88c9545..4e419646bc 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -365,8 +365,4 @@ obj/docking_port/stationary/public_mining_dock
 #undef BAD_ZLEVEL
 #undef BAD_AREA
 #undef BAD_COORDS
-<<<<<<< HEAD
-#undef ZONE_SET
-=======
 #undef BAD_TURF
->>>>>>> 19e2a76... minor set_landing_zone() refactor (#33780)