From 4aa52b8d997940b6c4a6c5b14d929f47907f5705 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 19 Jan 2018 14:32:40 -0500
Subject: [PATCH] Update life.dm

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

diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 7595b5276b..1a610d97a6 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -459,8 +459,4 @@
 		death()
 		var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 		if(B)
-<<<<<<< HEAD
-			B.damaged_brain = TRUE
-=======
 			B.damaged_brain = TRUE
->>>>>>> 15864dc... Temperature Refactor and Fixes (#34133)