merge conflict fixes for chat filters PR

code/modules/client/verbs/advanced_who.dm

@@ -93,10 +93,5 @@
 		msg += "[line]"
 	msg += "</table>"
 	msg += "<b>Total Players: [length(Lines)]</b>"
-<<<<<<< HEAD
-	msg = "<span class='filter_info'>" + msg + "</span>"
-	to_chat(src, msg)
-=======
 	msg = "<span class='filter_notice'>" + msg + "</span>"
 	to_chat(src, msg)
->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)

code/modules/client/verbs/who.dm

@@ -122,7 +122,6 @@
 	if(config.show_event_managers)
 		msg += "\n<b> Current Miscellaneous ([num_event_managers_online]):</b>\n" + eventMmsg
 
-<<<<<<< HEAD
 	var/num_mentors_online = 0
 	var/mmsg = ""
 
@@ -147,7 +146,4 @@
 
 	msg += "\n<span class='info'>Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond.</span>"
 
-	to_chat(src, msg)
-=======
 	to_chat(src,"<span class='filter_notice'>[jointext(msg, "<br>")]</span>")
->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)