Update life.dm

2018-01-19 14:32:40 -05:00
parent 7a16f0a3ef
commit 4aa52b8d99
1 changed files with 0 additions and 4 deletions
@@ -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)