public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-15 10:46:32 +00:00
Code Issues Releases Wiki Activity

Merge upstream into master

Browse Source
This commit is contained in:
nathan-castlehow
2019-08-01 19:55:21 +08:00
parent 090b5c32f0 606be4304d
commit 918a8627e9
75 changed files with 489 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/lib/contextMenuBuilder.test.js
View File

@@ -4,8 +4,13 @@ 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