Update admin.dm

2018-06-16 16:43:23 -05:00
parent b4edde2c0a
commit 7f6f8eb21f
1 changed files with 0 additions and 3 deletions
@@ -62,11 +62,8 @@
 		body += "<a href='?_src_=holder;[HrefToken()];borgpanel=[REF(M)]'>BP</a> - "
 	body += "<a href='?priv_msg=[M.ckey]'>PM</a> - "
 	body += "<a href='?_src_=holder;[HrefToken()];subtlemessage=[REF(M)]'>SM</a> - "
-<<<<<<< HEAD
-=======
 	if (ishuman(M) && M.mind)
 		body += "<a href='?_src_=holder;[HrefToken()];HeadsetMessage=[REF(M)]'>HM</a> - "
->>>>>>> 78e7c5f... Merge pull request #38482 from DaxDupont/syndicatemess
 	body += "<a href='?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(M)]'>FLW</a> - "
 	//Default to client logs if available
 	var/source = LOGSRC_MOB