From b90ca78092e413b5f57cbcac50591b80880f6cc1 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 13 May 2018 10:17:50 -0500
Subject: [PATCH] Update bitfields.dm

---
 code/_globalvars/bitfields.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index 9117f9a95a..e3f7d21ab0 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -127,12 +127,6 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"BANG_PROTECT_2" = BANG_PROTECT_2,
 		"HEALS_EARS_2" = HEALS_EARS_2,
 		"OMNITONGUE_2" = OMNITONGUE_2,
-<<<<<<< HEAD
-		"TESLA_IGNORE_2" = TESLA_IGNORE_2,
-		"NO_MAT_REDEMPTION_2" = NO_MAT_REDEMPTION_2,
-		"LAVA_PROTECT_2" = LAVA_PROTECT_2
-		)
-=======
 		"TESLA_IGNORE_2" = TESLA_IGNORE_2
 		),
 	"clothing_flags" = list(
@@ -143,5 +137,4 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NOSLIP" = NOSLIP,
 		"THICKMATERIAL" = THICKMATERIAL,
 	)
->>>>>>> ccf8fc5... Kills off three more flags from flags_2 (#37529)
 	))