From 98d7ac6de20a939452804cc6b9f7e08757f40fa5 Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Wed, 15 Nov 2023 18:46:55 +0300
Subject: [PATCH] Resolve conflicts

---
 code/game/machinery/nuclear_bomb.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm
index 2ce215b745919..e9bd6fe803a5f 100644
--- a/code/game/machinery/nuclear_bomb.dm
+++ b/code/game/machinery/nuclear_bomb.dm
@@ -291,12 +291,9 @@ var/global/bomb_set
 					secure_device()
 				update_icon()
 			if(href_list["evacuate"])
-<<<<<<< ours
-=======
 				if(timing)
 					to_chat(usr, SPAN_WARNING("Cannot alter evacuation during countdown."))
 					return
->>>>>>> theirs
 				evacuate = !evacuate
 			if(href_list["anchor"])
 				if(removal_stage == 5)