From 9651ae45b1b250510cfedb88be287d7d2036a741 Mon Sep 17 00:00:00 2001
From: Linzolle <linzolle@gmail.com>
Date: Sat, 24 Aug 2019 20:27:47 -0500
Subject: [PATCH] love to work with merge conflicts

---
 code/modules/mob/living/living_movement.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index d8d7c40ee2..116be93cec 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /mob/living/Moved()
 	. = ..()
 	update_turf_movespeed(loc)