Resolve conflicts

SierraBay · Nov 15, 2023 · 98d7ac6 · 98d7ac6
1 parent d1099d0
commit 98d7ac6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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)