From 7e897210635cef3cd3cfea14933ecfb134b2555e Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:14:58 -0400
Subject: [PATCH] Update ai_holder_combat_unseen.dm

---
 code/modules/ai/ai_holder_combat_unseen.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/ai/ai_holder_combat_unseen.dm b/code/modules/ai/ai_holder_combat_unseen.dm
index 060e6f8383b..8386168b620 100644
--- a/code/modules/ai/ai_holder_combat_unseen.dm
+++ b/code/modules/ai/ai_holder_combat_unseen.dm
@@ -13,9 +13,6 @@
 		// We conserve ammo (or can't shoot) so walk closer
 		if(get_dist(holder, target_last_seen_turf) > 1)
 			return give_destination(target_last_seen_turf, 1, TRUE) // Sets stance as well
-<<<<<<< HEAD
-		// We're right there, look around?
-=======
 		// We last saw them next to us, so do a blind attack on that tile.
 		else if(melee_on_tile(target_last_seen_turf) != ATTACK_SUCCESSFUL && intelligence_level >= AI_NORMAL)
 			var/obj/O = find_escape_route()
@@ -23,7 +20,6 @@
 				return give_destination(get_turf(O), 0, TRUE)
 			else
 				return find_target()
->>>>>>> c9873ff... Fixes some unseen combat ai jank (#8116)
 		else
 			return find_target()
 	// Shoot in their direction angrily