From eeca031c86b518223d32a8eb45f572f4d001af24 Mon Sep 17 00:00:00 2001
From: nathan-castlehow <nathan_castlehow@me.com>
Date: Thu, 1 Aug 2019 19:56:38 +0800
Subject: [PATCH] Merge upstream into master

---
 browser/components/MarkdownPreview.js | 4 ----
 browser/lib/contextMenuBuilder.js     | 9 ---------
 tests/lib/contextMenuBuilder.test.js  | 5 -----
 3 files changed, 18 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index e4c88de9..0072e403 100755
--- a/browser/components/MarkdownPreview.js
+++ b/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
     }
   }
 
diff --git a/browser/lib/contextMenuBuilder.js b/browser/lib/contextMenuBuilder.js
index 34f84789..ff3349eb 100644
--- a/browser/lib/contextMenuBuilder.js
+++ b/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'
   }]
 
diff --git a/tests/lib/contextMenuBuilder.test.js b/tests/lib/contextMenuBuilder.test.js
index e3753aca..b7009bf1 100644
--- a/tests/lib/contextMenuBuilder.test.js
+++ b/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