From e5e17cf3342040fdb7a0bd205e38afbf046205fa Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:24:27 -0500
Subject: [PATCH] Update bear.dm

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

diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 2300eb5c7c..d63b5d4114 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -36,13 +36,9 @@
 	maxbodytemp = 1500
 
 	faction = list("russian")
-<<<<<<< HEAD
-	gold_core_spawnable = 1
+	gold_core_spawnable = HOSTILE_SPAWN
 	devourable = TRUE
 	no_vore = FALSE
-=======
-	gold_core_spawnable = HOSTILE_SPAWN
->>>>>>> 2abae67... Cleans up goldcore defines (#33090)
 
 //SPACE BEARS! SQUEEEEEEEE~     OW! FUCK! IT BIT MY HAND OFF!!
 /mob/living/simple_animal/hostile/bear/Hudson