Build #20181348:   moar cleanup on branch vy/merge-conflict-pane about 7 years ago

Build #674:   Make backward compatible with versions of Atom that can't auto-restart on branch master about 7 years ago