Update items.dm

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()
+	return get_rating()