Update flightsuit.dm

2017-10-09 21:27:59 -05:00
parent e8d09d796a
commit 3232f0a2a0
1 changed files with 0 additions and 4 deletions
@@ -869,12 +869,8 @@
 	var/obj/item/device/flightpack/pack = null
 	var/mob/living/carbon/human/wearer = null
 	var/active = FALSE
-<<<<<<< HEAD
-	resistance_flags = FIRE_PROOF
-=======
 	permeability_coefficient = 0.01
 	resistance_flags = FIRE_PROOF | ACID_PROOF
->>>>>>> db0c10e... Refactors virus spreading (#31066)

 /obj/item/clothing/shoes/flightshoes/Destroy()
 	pack = null