From 3232f0a2a0b25264884aa5c2c0b7fa702f3e207d Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 9 Oct 2017 21:27:59 -0500
Subject: [PATCH] Update flightsuit.dm

---
 code/modules/clothing/spacesuits/flightsuit.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm
index f66eae98d8..d6094d1c1f 100644
--- a/code/modules/clothing/spacesuits/flightsuit.dm
+++ b/code/modules/clothing/spacesuits/flightsuit.dm
@@ -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