We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 828c264 commit 3155fd5Copy full SHA for 3155fd5
src/index.ts
@@ -55,6 +55,16 @@ joplin.plugins.register({
55
await dialogs.addScript(diffViewDialog, './UI/index.js');
56
await dialogs.addScript(diffViewDialog, './UI/codemirror/addon/merge/merge.css');
57
await dialogs.addScript(diffViewDialog, './UI/index.css');
58
+ await dialogs.setButtons(diffViewDialog, [
59
+ {
60
+ id: 'submit',
61
+ title: 'Save'
62
+ },
63
64
+ id: 'cancel',
65
+ title: 'Cancel'
66
+ }
67
+ ]);
68
69
await joplin.commands.register({
70
name: 'resolveConflictsCommand',
0 commit comments