From dcff61724acbf3a8a73155090d5fc43d3a2cf4a7 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Thu, 12 Apr 2018 07:04:09 -0500
Subject: [PATCH] Update dna.dm

---
 code/datums/dna.dm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index 0ebd52177f..49120b03b5 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -13,11 +13,6 @@
 	var/mob/living/holder
 
 /datum/dna/New(mob/living/new_holder)
-<<<<<<< HEAD
-	if(new_holder)
-		holder = new_holder
-
-=======
 	if(istype(new_holder))
 		holder = new_holder
 
@@ -34,8 +29,7 @@
 	previous.Cut()					//^
 
 	return ..()
-
->>>>>>> a6e8247... Fixes brain dna (#37132)
+	
 /datum/dna/proc/transfer_identity(mob/living/carbon/destination, transfer_SE = 0)
 	if(!istype(destination))
 		return