mirror of
https://github.com/atom/atom.git
synced 2026-01-24 06:18:03 -05:00
--- Re-applying this commit because it was accidentally merged from stable into beta and master with `--strategy ours` (discard all changes) instead of `-X ours` (discard conflicting changes).