Update sloth.dm

2017-11-28 22:19:08 -05:00
parent ad135a57a3
commit 4ff2063a4a
1 changed files with 1 additions and 6 deletions
--- 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