From dc7dd2da3ced136346666f93fe8ee103941e1e6e Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 12:05:09 -0500
Subject: [PATCH] Update dead.dm

---
 code/modules/mob/dead/dead.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index fcb6434d85..689ef552d9 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -24,8 +24,6 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 /mob/dead/ConveyorMove()	//lol
 	return
 
-<<<<<<< HEAD
-=======
 /mob/dead/Stat()
 	..()
 
@@ -43,8 +41,6 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 		stat(null, "Time To Start: DELAYED")
 	else
 		stat(null, "Time To Start: SOON")
->>>>>>> a01cf60... Fixes lobby stat entries not showing (#33496)
-
 
 /mob/dead/proc/server_hop()
 	set category = "OOC"