From 513dfc7821afae26bc85324b72817e45046a2970 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 22 Oct 2017 10:51:36 -0500
Subject: [PATCH] Update transform_procs.dm

---
 code/modules/mob/transform_procs.dm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index f8c262636b..b934572e4f 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -462,18 +462,9 @@
 	. = new_slime
 	qdel(src)
 
-<<<<<<< HEAD
-/mob/proc/become_overmind(mode_made, starting_points = 60)
-	var/mob/camera/blob/B = new /mob/camera/blob(loc, 0, mode_made, starting_points)
-	if(mind)
-		mind.transfer_to(B)
-	else
-		B.key = key
-=======
 /mob/proc/become_overmind(starting_points = 60)
 	var/mob/camera/blob/B = new /mob/camera/blob(loc, starting_points)
 	B.key = key
->>>>>>> 7034a22... Blob fixes (#31913)
 	. = B
 	qdel(src)