Update emote.dm

2017-10-04 17:42:38 -05:00
parent 77c422d011
commit cfd98caf98
1 changed files with 0 additions and 1 deletions
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //The code execution of the emote datum is located at code/datums/emotes.dm
 /mob/living/emote(act, m_type = null, message = null)
 	act = lowertext(act)