From 0e3d5a75121a7690a8002b0749fcf381eda4b48f Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sat, 9 Jun 2018 00:35:13 -0400
Subject: [PATCH] Update infrared.dm

---
 code/modules/assembly/infrared.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 5f24f10b4b..fe6e94605b 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -167,13 +167,9 @@
 	listener = newloc.AddComponent(/datum/component/redirect, COMSIG_ATOM_EXITED, CALLBACK(src, .proc/check_exit))
 
 /obj/item/assembly/infra/proc/check_exit(atom/movable/offender)
-<<<<<<< HEAD
-	if(offender && ((offender.flags_1 & ABSTRACT_1) || offender == src))
-=======
 	if(QDELETED(src))
 		return
 	if(offender == src || istype(offender,/obj/effect/beam/i_beam))
->>>>>>> 641a7d1... Fixes infrared emmiters partially. (#38301)
 		return
 	return refreshBeam()