Update navigation_computer.dm

2018-03-09 14:39:51 -05:00
parent f8d783ae70
commit 28e6c899b2
1 changed files with 0 additions and 3 deletions
@@ -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