From 03561c03d6e796e5817dc5eec67c13c65276a488 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 16 Jul 2021 18:20:44 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/mining/mine_turfs.dm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 76738f2654..9155f054a4 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -5,8 +5,7 @@ var/list/mining_overlay_cache = list()
 	name = "impassable rock"
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "rock-dark"
-<<<<<<< HEAD
-	density = 1
+	density = TRUE
 	opacity = 1 // YW edit. Stops all my unsimulated tiles from being seethrough.
 
 //YW add start
@@ -16,11 +15,6 @@ var/list/mining_overlay_cache = list()
 	icon = 'icons/turf/snow_new.dmi'
 	icon_state = "Icerock"
 //YW add end
-||||||| parent of 577b986ba6... Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
-	density = 1
-=======
-	density = TRUE
->>>>>>> 577b986ba6... Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
 
 /turf/simulated/mineral //wall piece
 	name = "rock"