Merge upstream into master

Author: nathan-castlehow

browser/components/MarkdownPreview.js

@@ -248,11 +248,7 @@ export default class MarkdownPreview extends React.Component {
   handleContextMenu (event) {
     const menu = buildMarkdownPreviewContextMenu(this, event)
     if (menu != null) {
-<<<<<<< HEAD
-      setTimeout(() => menu.popup(remote.getCurrentWindow()), 30)
-=======
       menu.popup(remote.getCurrentWindow())
->>>>>>> upstream/master
     }
   }
 

browser/lib/contextMenuBuilder.js

@@ -81,17 +81,8 @@ const buildMarkdownPreviewContextMenu = function (markdownPreview, event) {
 
   // Default context menu inclusions
   const template = [{
-<<<<<<< HEAD
-    role: 'cut'
-  }, {
-    role: 'copy'
-  }, {
-    role: 'paste'
-  }, {
-=======
     role: 'copy'
   }, {
->>>>>>> upstream/master
     role: 'selectall'
   }]
 

tests/lib/contextMenuBuilder.test.js

@@ -4,13 +4,8 @@ jest.mock('electron', () => {
 })
 
 const spellcheck = require('browser/lib/spellcheck')
-<<<<<<< HEAD
-const buildEditorContextMenu = require('browser/lib/contextMenuBuilder')
-const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder')
-=======
 const buildEditorContextMenu = require('browser/lib/contextMenuBuilder').buildEditorContextMenu
 const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder').buildMarkdownPreviewContextMenu
->>>>>>> upstream/master
 
 beforeEach(() => {
   menuBuilderParameter = null