From 0b1f139046bf6246e153cb3485e3e022da46f3bf Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Mon, 21 Mar 2022 18:53:49 +0000
Subject: [PATCH] Update xeno.dm

---
 code/modules/xenobio2/mob/xeno.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm
index aac83cba5e1..835ef9af4dd 100644
--- a/code/modules/xenobio2/mob/xeno.dm
+++ b/code/modules/xenobio2/mob/xeno.dm
@@ -101,12 +101,6 @@ Also includes Life and New
 		stasis += hit.stasisforce
 	..()
 
-<<<<<<< HEAD
 /mob/living/simple_mob/xeno/Destroy()
-	traitdat.Destroy()	//Let's clean up after ourselves.
-	traitdat = null
-=======
-/mob/living/simple_animal/xeno/Destroy()
 	QDEL_NULL(traitdat)
->>>>>>> a7877d86e50... Merge pull request #8341 from MistakeNot4892/qdel
 	..()
\ No newline at end of file