From bf70c3ec3bb21aafab24887bb772d2a835b86f25 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 20 Dec 2019 01:14:31 -0500
Subject: [PATCH] Update configuration.dm

---
 code/controllers/configuration.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 67b4f4be4df..c3c6e4eca6e 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -237,12 +237,8 @@ var/list/gamemode_cache = list()
 
 	var/radiation_resistance_calc_mode = RAD_RESIST_CALC_SUB // 0:1 subtraction:division for computing effective radiation on a turf
 	var/radiation_decay_rate = 1 //How much radiation is reduced by each tick
-<<<<<<< HEAD
 	var/radiation_resistance_multiplier = 8.5 //VOREstation edit
-=======
-	var/radiation_resistance_multiplier = 6.5
 	var/radiation_material_resistance_divisor = 1
->>>>>>> ac8dd55... Buffs radiation so it isn't defeated by a thin sheet of lead. (#6572)
 	var/radiation_lower_limit = 0.35 //If the radiation level for a turf would be below this, ignore it.
 
 	var/random_submap_orientation = FALSE // If true, submaps loaded automatically can be rotated.