From 5e6e72566630fe6be896f0e8a8a360761ff58e2c Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 22 Nov 2017 14:47:15 -0500
Subject: [PATCH] Update color.dm

---
 code/modules/clothing/gloves/color.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 98c5710029..8b714f25dd 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -77,13 +77,8 @@
 	name = "insulated gloves"
 	desc = "These gloves will protect the wearer from electric shock."
 	siemens_coefficient = 0
-<<<<<<< HEAD
 	permeability_coefficient = 0.5
-	resistance_flags = 0
-=======
-	permeability_coefficient = 0.05
 	resistance_flags = NONE
->>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
 
 /obj/item/clothing/gloves/color/rainbow
 	name = "rainbow gloves"