From 06b765179930124285a129fd0d3236f49a05e182 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 10 Feb 2020 18:59:12 -0500
Subject: [PATCH] Update nanopaste.dm

---
 code/game/objects/items/stacks/nanopaste.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index cd2ee26d555..3a5bdbf11d2 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -29,10 +29,6 @@
 	if (istype(M,/mob/living/carbon/human))		//Repairing robolimbs
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
-<<<<<<< HEAD
-		//VOREStation Edit Start
-=======
-
 		if(!S)
 			to_chat(user, "<span class='warning'>No body part there to work on!</span>")
 			return 1
@@ -46,7 +42,7 @@
 				to_chat(user, "<span class='warning'>You can't apply [src] through [H.wear_suit]!</span>")
 				return 1
 
->>>>>>> d0159d3... Merge pull request #6666 from Heroman3003/synthpair-fix
+		//VOREStation Edit Start
 		if (S && (S.robotic >= ORGAN_ROBOT))
 			if(!S.get_damage())
 				to_chat(user, "<span class='notice'>Nothing to fix here.</span>")