From 588b76b59e045d1f270f65b69e66ec5162188b15 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 20 Nov 2017 13:57:15 -0500
Subject: [PATCH] Update lootdrop.dm

---
 code/game/objects/effects/spawners/lootdrop.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 316f7f34c9..34e6793d5b 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -162,9 +162,6 @@
 	name = "25% cyborg mask spawner"
 	loot = list(
 		/obj/item/clothing/mask/gas/cyborg = 25,
-<<<<<<< HEAD
-		"" = 75)
-=======
 		"" = 75)
 
 /obj/effect/spawner/lootdrop/aimodule_harmless // These shouldn't allow the AI to start butchering people
@@ -197,4 +194,3 @@
 				/obj/item/aiModule/core/full/tyrant,
 				/obj/item/aiModule/core/full/thermurderdynamic
 				)
->>>>>>> de7a093... Merge pull request #32905 from vuonojenmustaturska/aispawner