Merge branch 'master' into aw-double-toggle

smashwilson · web-flow · commit 0859929a40aa · 2017-06-01T16:02:55.000-04:00
diff --git a/lib/worker.js b/lib/worker.js
@@ -80,15 +80,15 @@ ipc.on(channelName, (event, {type, data}) => {
         event.sender.sendTo(managerWebContentsId, channelName, {
           sourceWebContentsId,
           type: 'git-spawn-error',
-          id, err,
+          data: {id, err},
         });
       });
 
       child.stdin.on('error', err => {
         event.sender.sendTo(managerWebContentsId, channelName, {
           sourceWebContentsId,
           type: 'git-stdin-error',
-          id, stdin: options.stdin, err,
+          data: {id, stdin: options.stdin, err},
         });
       });
     };
diff --git a/styles/status-bar-tile-controller.less b/styles/status-bar-tile-controller.less
@@ -41,6 +41,11 @@
     animation: github-StatusBarSync-animation 2s linear 30; // limit to 1min in case something gets stuck
   }
 
+  // Merge conflict icon
+  .github-ChangedFilesCount .icon-alert {
+    margin-left: @component-padding / 2;
+  }
+
   .github-branch-detached {
     color: @text-color-subtle;
     font-style: italic;
