From dd53de885934b10fac361161022294c95054c351 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 23 Oct 2017 14:15:43 -0500
Subject: [PATCH] Update mob.dm

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

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c1279ac089..beb64a9e6e 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -26,11 +26,6 @@
 	else
 		GLOB.living_mob_list += src
 	prepare_huds()
-<<<<<<< HEAD
-	can_ride_typecache = typecacheof(can_ride_typecache)
-	hook_vr("mob_new",list(src))
-=======
->>>>>>> 8e434b7... Removes duplicate typecaches (#31883)
 	for(var/v in GLOB.active_alternate_appearances)
 		if(!v)
 			continue