🗣

RT @JulianLepinski: Git needs my help manually resolving a conflict between two identical lines, one with a trailing whitespace. http://t.…