Update ed209bot.dm

2017-09-12 23:19:05 -05:00
parent f55ad5ec95
commit c924ec765a
1 changed files with 0 additions and 1 deletions
@@ -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."