From de4014964f54f44b8403e92f4867aa5690278585 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 6 Dec 2017 13:21:45 -0500
Subject: [PATCH] Update brain_item.dm

---
 code/modules/mob/living/brain/brain_item.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 3f67171e80..cb1cdac517 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -180,9 +180,7 @@
 	name = "alien brain"
 	desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
 	icon_state = "brain-x"
-<<<<<<< HEAD
 	origin_tech = "biotech=6"
-=======
 
 
 ////////////////////////////////////TRAUMAS////////////////////////////////////////
@@ -226,4 +224,3 @@
 		var/datum/brain_trauma/trauma = X
 		if(cure_permanent || !trauma.permanent)
 			qdel(trauma)
->>>>>>> 550d711... Brain Traumas (#31727)