Update helpers.dm

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