From 1998c3ff5ca95c522e3f5b591f72a37ad26b8f54 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 4 Dec 2017 16:15:14 -0500
Subject: [PATCH] Update _component.dm

---
 code/datums/components/_component.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index 8437d0a7dd..0284d2c446 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -186,14 +186,8 @@
 		for(var/I in target)
 			var/datum/component/C = I
 			if(!C.enabled)
-<<<<<<< HEAD
-				continue			
-			var/list/sps = C.signal_procs
-			var/datum/callback/CB = LAZYACCESS(sps, sigtype)
-=======
 				continue
 			var/datum/callback/CB = C.signal_procs[sigtype]
->>>>>>> 4e01bba... SendSignal optimization (#33220)
 			if(!CB)
 				continue
 			var/retval = CB.InvokeAsync(arglist(arguments))