From c924ec765a4c76c9368026fea490bd5c5676fac2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 12 Sep 2017 23:19:05 -0500 Subject: [PATCH] Update ed209bot.dm --- code/modules/mob/living/simple_animal/bot/ed209bot.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 0fa3b3d37a..3cd66724e9 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -1,4 +1,3 @@ -<<<<<<< HEAD /mob/living/simple_animal/bot/ed209 name = "\improper ED-209 Security Robot" desc = "A security robot. He looks less than thrilled."