mirror of
https://github.com/atom/atom.git
synced 2026-01-24 14:28:14 -05:00
Conflicts: spec/app/editor-spec.coffee spec/app/root-view-spec.coffee src/app/editor.coffee src/extensions/strip-trailing-whitespace.coffee
Conflicts: spec/app/editor-spec.coffee spec/app/root-view-spec.coffee src/app/editor.coffee src/extensions/strip-trailing-whitespace.coffee