public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +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
browser/lib/contextMenuBuilder.js
View File

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