Resolve seconf conflict

SierraBay · Nov 18, 2023 · 02ed2c8 · 02ed2c8
1 parent f5987f2
commit 02ed2c8
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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()