From 3381d79c4f5f73f7f6e8f79a92f1f8744e88a25e Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 17 Mar 2023 01:57:02 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/overmap/sectors.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm
index c3dc4441b4..da4770c2c3 100644
--- a/code/modules/overmap/sectors.dm
+++ b/code/modules/overmap/sectors.dm
@@ -81,12 +81,9 @@
 		color = null
 		real_desc = desc
 		desc = "Scan this to find out more information."
-<<<<<<< HEAD
-=======
 	//at the moment only used for the OM location renamer. Initializing here in case we want shuttles incl as well in future. Also proc definition convenience.
 	visitable_overmap_object_instances |= src
 
->>>>>>> ec61e89345... Merge pull request #14616 from Runa-Dacino/OMNameLandmarkTry2
 
 
 // You generally shouldn't destroy these.