From 4ff2063a4a595af85d8d5e6bd124af3dd62dfdbb Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 28 Nov 2017 22:19:08 -0500
Subject: [PATCH] Update sloth.dm

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

diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index 8baf500bda..6f19632e88 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -19,14 +19,9 @@
 	melee_damage_upper = 18
 	health = 50
 	maxHealth = 50
-<<<<<<< HEAD
-	speed = 2
-	devourable = TRUE
-=======
 	speed = 10
 	glide_size = 2
->>>>>>> 01ad14d... Makes the sloth an actual sloth (#33131)
-
+	devourable = TRUE
 
 //Cargo Sloth
 /mob/living/simple_animal/sloth/paperwork