Update ai_monitored.dm

2017-11-09 03:17:59 -06:00
parent 45a64018c5
commit b0439afd08
1 changed files with 0 additions and 5 deletions
@@ -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)