From 61c7080c34e5c5490228a6bc763c444f3ed58bfd Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 19 Dec 2017 15:34:59 -0600
Subject: [PATCH] Update game_mode.dm

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

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 0c6a8fd1e0..71824c4590 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -450,8 +450,6 @@
 /datum/game_mode/proc/OnNukeExplosion(off_station)
 	if(off_station < 2)
 		station_was_nuked = TRUE //Will end the round on next check.
-<<<<<<< HEAD
-=======
 
 //Additional report section in roundend report
 /datum/game_mode/proc/special_report()
@@ -466,4 +464,3 @@
 		SSticker.news_report = STATION_EVACUATED
 		if(SSshuttle.emergency.is_hijacked())
 			SSticker.news_report = SHUTTLE_HIJACK
->>>>>>> 3d81385... Roundend report refactor (#33246)