From 933b4a7a3a18e7b907310f69c72405b09c6ce104 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:21:55 -0500
Subject: [PATCH] Update crab.dm

---
 code/modules/mob/living/simple_animal/friendly/crab.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 99d91b299e..35d7d12174 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -19,12 +19,8 @@
 	ventcrawler = VENTCRAWLER_ALWAYS
 	var/obj/item/inventory_head
 	var/obj/item/inventory_mask
-<<<<<<< HEAD
-	gold_core_spawnable = 2
-	devourable = TRUE
-=======
 	gold_core_spawnable = FRIENDLY_SPAWN
->>>>>>> 2abae67... Cleans up goldcore defines (#33090)
+	devourable = TRUE
 
 /mob/living/simple_animal/crab/Life()
 	..()