From b0439afd0828b9a17c8be61ce67f69b45f4a43bf Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Thu, 9 Nov 2017 03:17:59 -0600
Subject: [PATCH] Update ai_monitored.dm

---
 code/game/area/ai_monitored.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm
index 18d1f82239..a5216fb44c 100644
--- a/code/game/area/ai_monitored.dm
+++ b/code/game/area/ai_monitored.dm
@@ -27,10 +27,5 @@
 	if (ismob(O) && motioncameras.len)
 		for(var/X in motioncameras)
 			var/obj/machinery/camera/cam = X
-<<<<<<< HEAD
-			cam.lostTarget(O)
-			return
-=======
 			cam.lostTargetRef(WEAKREF(O))
 			return
->>>>>>> 4edd802... Weak references + Cameras now use them (#32504)