From 396245d85f0702158df3b1719dea6199f50efacd Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 27 Jan 2018 14:16:47 -0600
Subject: [PATCH] Update mob.dm

---
 code/modules/mob/mob.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 269a52be78..07caeba711 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -33,11 +33,8 @@
 			continue
 		var/datum/atom_hud/alternate_appearance/AA = v
 		AA.onNewMob(src)
-<<<<<<< HEAD
 	hook_vr("mob_new",list(src))
-=======
 	nutrition = rand(NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_START_MAX)
->>>>>>> 6f65453... Mobs start with a random nutrition amount (#34791)
 	. = ..()
 
 /mob/GenerateTag()