From 02ed2c831cb8b2d1dcb2d9d58ac3542550b72f5f Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Sat, 18 Nov 2023 22:35:37 +0300
Subject: [PATCH] Resolve seconf conflict

---
 code/controllers/configuration.dm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 49407cc696026..f217eeac0bb18 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -430,13 +430,11 @@
 
 	var/static/deletion_starts_paused = TRUE
 
-<<<<<<< ours
 	// [SIERRA-ADD]
 	var/static/shutdown_on_reboot = FALSE
 	// [/SIERRA-ADD]
-=======
+
 	var/static/enable_cold_mist = FALSE
->>>>>>> theirs
 
 
 /datum/configuration/New()