From c0f080cd3a682a09d1fa780d451d37d56a419cf6 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 12 Dec 2021 05:12:47 -0500
Subject: [PATCH] powder that makes you say yes

---
 maps/stellardelight/stellar_delight_defines.dm | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/maps/stellardelight/stellar_delight_defines.dm b/maps/stellardelight/stellar_delight_defines.dm
index cddfca39f4..b4709a2d8c 100644
--- a/maps/stellardelight/stellar_delight_defines.dm
+++ b/maps/stellardelight/stellar_delight_defines.dm
@@ -4,20 +4,6 @@
 #define Z_LEVEL_SHIP_HIGH					3
 #define Z_LEVEL_CENTCOM						4
 #define Z_LEVEL_MISC						5
-<<<<<<< HEAD
-<<<<<<< HEAD
-#define Z_LEVEL_BEACH						6
-#define Z_LEVEL_BEACH_CAVE					7
-#define Z_LEVEL_AEROSTAT					8
-#define Z_LEVEL_AEROSTAT_SURFACE			9
-#define Z_LEVEL_DEBRISFIELD					10
-#define Z_LEVEL_FUELDEPOT					11
-#define Z_LEVEL_OVERMAP						12
-#define Z_LEVEL_OFFMAP1						13
-#define Z_LEVEL_GATEWAY						14
-=======
-=======
->>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
 #define Z_LEVEL_SPACE_ROCKS					6
 #define Z_LEVEL_BEACH						7
 #define Z_LEVEL_BEACH_CAVE					8
@@ -28,11 +14,7 @@
 #define Z_LEVEL_OVERMAP						13
 #define Z_LEVEL_OFFMAP1						14
 #define Z_LEVEL_GATEWAY						15
-<<<<<<< HEAD
 #define Z_LEVEL_OM_ADVENTURE				16
->>>>>>> 60011ecd0b... Merge pull request #11928 from Very-Soft/whalesandcrystals
-=======
->>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
 
 //Camera networks
 #define NETWORK_HALLS "Halls"