From 96173e6fc2311cccf93d2771a1e0078efbabca2e Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 18 Mar 2021 10:28:35 -0400
Subject: [PATCH] Update items.dm

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

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 8ab75002e6e..21775d0403c 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -354,13 +354,10 @@
 		playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds)
 	return
 
-<<<<<<< HEAD
-=======
 // As above but for items being equipped to an active module on a robot.
 /obj/item/proc/equipped_robot(var/mob/user)
 	return
 
->>>>>>> 921ac67... Merge pull request #7980 from MistakeNot4892/gps
 //Defines which slots correspond to which slot flags
 var/list/global/slot_flags_enumeration = list(
 	"[slot_wear_mask]" = SLOT_MASK,
@@ -957,4 +954,4 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 
 // Like the above, but used for RPED sorting of parts.
 /obj/item/proc/rped_rating()
-	return get_rating()
\ No newline at end of file
+	return get_rating()