From b99e19a9782aa6e25601846c6da24f3df372489a Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Thu, 21 May 2020 03:41:03 -0700
Subject: [PATCH] Update gauntlets.dm

---
 code/modules/clothing/gloves/gauntlets.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/clothing/gloves/gauntlets.dm b/code/modules/clothing/gloves/gauntlets.dm
index 66fd70c1bd..6096a54af4 100644
--- a/code/modules/clothing/gloves/gauntlets.dm
+++ b/code/modules/clothing/gloves/gauntlets.dm
@@ -14,11 +14,7 @@
 	punch_force = 5
 	var/obj/item/clothing/gloves/gloves = null	//Undergloves
 
-<<<<<<< HEAD
-/obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = 0)
-=======
 /obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = FALSE)
->>>>>>> e791692aea59a96b1b45c20d61974aa10493a7f6
 	var/mob/living/carbon/human/H = user
 	if(H.gloves)
 		gloves = H.gloves
@@ -51,4 +47,4 @@
 		if(ring)
 			gloves.ring = ring
 		src.gloves = null
-	wearer = null
\ No newline at end of file
+	wearer = null