From e40eab31cb0284e2394b7a98f047842784d1bf84 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 19 Feb 2022 18:48:47 -0500
Subject: [PATCH] powder that makes you say yes

---
 maps/submaps/surface_submaps/wilderness/emptycabin.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm
index f6f31f818e..5c6c91f093 100644
--- a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm
+++ b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 "a" = (/turf/template_noop,/area/template_noop)
 "b" = (/obj/effect/decal/cleanable/filth,/obj/item/weapon/bone/arm,/obj/item/weapon/bone/skull/unathi,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin)
 "c" = (/obj/structure/curtain/black,/obj/structure/simple_door/sifwood,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin)