1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00

Merge upstream into master

This commit is contained in:
nathan-castlehow
2019-08-01 19:56:38 +08:00
parent 918a8627e9
commit eeca031c86
3 changed files with 0 additions and 18 deletions

View File

@@ -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'
}]