From 1bfba8fd50a421ee3c39902e9e5fe2db2a545e8e Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 4 Jan 2018 20:56:53 -0500
Subject: [PATCH] Update nuclearbomb.dm

---
 code/game/gamemodes/nuclear/nuclearbomb.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index e88e797bcf..68340a1da3 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -573,11 +573,8 @@ This is here to make the tiles around the station mininuke change when it's arme
 	playsound(src, 'sound/machines/alarm.ogg', 30, -1, 1)
 	addtimer(CALLBACK(src, .proc/manual_suicide, user), 101)
 	return MANUAL_SUICIDE
-<<<<<<< HEAD
-=======
 
 /obj/item/disk/fakenucleardisk/examine(mob/user)
 	..()
 	if(Adjacent(user))
 		to_chat(user, "<span class='warning'>Wait, this is a fake!</span>")
->>>>>>> 32a205b... You now have to stand next to the decoy nuke disk and examine it to know it's fake (#34059)