From 28e6c899b2f71282ae580870e8abae15dd464523 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 9 Mar 2018 14:39:51 -0500
Subject: [PATCH] Update navigation_computer.dm

---
 code/modules/shuttle/navigation_computer.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 5d65a303da..17f27a81b0 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -26,15 +26,12 @@
 	. = ..()
 	GLOB.navigation_computers -= src
 
-<<<<<<< HEAD
-=======
 /obj/machinery/computer/camera_advanced/shuttle_docker/attack_hand(mob/user)
 	if(jammed)
 		to_chat(user, "<span class='warning'>The Syndicate is jamming the console!</span>")
 		return
 	return ..()
 
->>>>>>> 2a00750... US english memes
 /obj/machinery/computer/camera_advanced/shuttle_docker/GrantActions(mob/living/user)
 	if(jumpto_ports.len)
 		jump_action = new /datum/action/innate/camera_jump/shuttle_docker