From be42e971016a126a6b74491cf28689a6b43af70f Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 7 May 2018 08:47:44 -0400
Subject: [PATCH] Update helpers.dm

---
 code/modules/assembly/helpers.dm | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm
index dd3f88bff4..f1dc93b446 100644
--- a/code/modules/assembly/helpers.dm
+++ b/code/modules/assembly/helpers.dm
@@ -1,21 +1,3 @@
-<<<<<<< HEAD
-// See _DEFINES/is_helpers.dm for type helpers
-
-/*
-Name:	IsSpecialAssembly
-Desc:	If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door
-*/
-
-/obj/proc/IsSpecialAssembly()
-	return 0
-
-/*
-Name:	IsAssemblyHolder
-Desc:	If true is an object that can hold an assemblyholder object
-*/
-/obj/proc/IsAssemblyHolder()
-	return 0
-=======
 // See _DEFINES/is_helpers.dm for type helpers
 
 /*
@@ -31,5 +13,4 @@ Name:	IsAssemblyHolder
 Desc:	If true is an object that can hold an assemblyholder object
 */
 /obj/proc/IsAssemblyHolder()
-	return FALSE
->>>>>>> b4d11c6... Shows assemblies some love. ♥ (#37632)
+	return FALSE