# Conflicts: # code/modules/mob/living/carbon/human/whisper.dm Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
58ef59734f