From a4345c8fdb431ac204c483fcb0b3fb680d2acdbe Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 11 Jun 2018 23:13:46 -0400
Subject: [PATCH] Update stabilized.dm

---
 .../modules/research/xenobiology/crossbreeding/stabilized.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/modules/research/xenobiology/crossbreeding/stabilized.dm b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
index 4eec61ade1..cc80c3a780 100644
--- a/code/modules/research/xenobiology/crossbreeding/stabilized.dm
+++ b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
@@ -96,8 +96,6 @@ Stabilized extracts:
 
 /obj/item/slimecross/stabilized/gold
 	colour = "gold"
-<<<<<<< HEAD
-=======
 	var/mob_type
 	var/datum/mind/saved_mind
 	var/mob_name = "Familiar"
@@ -141,7 +139,6 @@ Stabilized extracts:
 			mob_name = newname
 		to_chat(user, "<span class='notice'>You speak softly into [src], and it shakes slightly in response.</span>")
 		START_PROCESSING(SSobj, src)
->>>>>>> b2e9fe8... Fixes and Upgrades Stabilized Gold Extracts (#38394)
 
 /obj/item/slimecross/stabilized/oil
 	colour = "oil"
@@ -166,4 +163,4 @@ Stabilized extracts:
 		regencore = regen
 		regen.forceMove(src)
 		return
-	return ..()
\ No newline at end of file
+	return ..()