From a815e7b384a4f16f2f6ade749bfb0b83245281d2 Mon Sep 17 00:00:00 2001
From: cadyn <35672377+cadyn@users.noreply.github.com>
Date: Sat, 27 Feb 2021 13:23:03 -0800
Subject: [PATCH] Update global_lists.dm

---
 code/_helpers/global_lists.dm | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm
index 1d8f16087a..524dd23ff4 100644
--- a/code/_helpers/global_lists.dm
+++ b/code/_helpers/global_lists.dm
@@ -93,8 +93,6 @@ var/global/list/string_slot_flags = list(
 	"holster" = SLOT_HOLSTER
 )
 
-<<<<<<< HEAD
-//CHOMP Edit: This fix is taken from citadel station pr #2779. Fixes a "pretty horrific memory leak" that is called any time someone opens character creator.
 GLOBAL_LIST_EMPTY(mannequins)
 /proc/get_mannequin(var/ckey = "NULL")
 	var/mob/living/carbon/human/dummy/mannequin/M = GLOB.mannequins[ckey]
@@ -102,23 +100,6 @@ GLOBAL_LIST_EMPTY(mannequins)
 		GLOB.mannequins[ckey] = new /mob/living/carbon/human/dummy/mannequin(null)
 		M = GLOB.mannequins[ckey]
 	return M
-||||||| parent of 881bc76902... Merge pull request #9805 from Verkister/blurgh
-/proc/get_mannequin(var/ckey)
-	if(!mannequins_)
-		mannequins_ = new()
- 	. = mannequins_[ckey]
-	if(!.)
-		. = new/mob/living/carbon/human/dummy/mannequin()
-		mannequins_[ckey] = .
-=======
-GLOBAL_LIST_EMPTY(mannequins)
-/proc/get_mannequin(var/ckey = "NULL")
-	var/mob/living/carbon/human/dummy/mannequin/M = GLOB.mannequins[ckey]
-	if(!istype(M))
-		GLOB.mannequins[ckey] = new /mob/living/carbon/human/dummy/mannequin(null)
-		M = GLOB.mannequins[ckey]
-	return M
->>>>>>> 881bc76902... Merge pull request #9805 from Verkister/blurgh
 
 //////////////////////////
 /////Initial Building/////