atom-editor-git: Sync with community/atom

Partially, as one patch needed a further adjustment.
Replace replaces with the proper conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/atom.js b/atom.js
index f9c7e17d19c6..c3efd46e391e 100644
--- a/atom.js
+++ b/atom.js
@@ -1,4 +1,4 @@
-#!/usr/bin/electron4
+#!/usr/bin/electron5
 
 const name = "atom";