Skip to content

Commit 1991866

Browse files
committed
Fix merge conflict
1 parent cd9df81 commit 1991866

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"theme": "dark"
1414
},
1515
"activationEvents": [
16-
"onCommand:HackMD.createCodeSnippet"
16+
"onCommand:HackMD.createCodeSnippet",
1717
"onView:mdTreeItems",
1818
"onCommand:HackMD.login",
1919
"onCommand:HackMD.logout",
@@ -65,10 +65,6 @@
6565
"markdown.previewStyles": [
6666
"./dist/page.css"
6767
],
68-
"commands": [
69-
{
70-
"command": "HackMD.createCodeSnippet",
71-
"title": "HackMD: Create a code snippet"
7268
"viewsContainers": {
7369
"activitybar": [
7470
{
@@ -87,6 +83,10 @@
8783
]
8884
},
8985
"commands": [
86+
{
87+
"command": "HackMD.createCodeSnippet",
88+
"title": "HackMD: Create a code snippet"
89+
},
9090
{
9191
"command": "HackMD.login",
9292
"title": "Login",

src/commands/treeView.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export async function registerTreeViewCommands(context: vscode.ExtensionContext)
5555
const content = await API.exportString(noteNode.noteId, ExportType.MD);
5656
if (!checkNoteExist(content)) { return; }
5757

58-
console.log(noteNode.label);
5958
const uri = vscode.Uri.parse(`hackmd:${noteNode.label}.md#${noteNode.noteId}`);
6059
const doc = await vscode.workspace.openTextDocument(uri);
6160
await vscode.window.showTextDocument(doc, { preview: false });

0 commit comments

Comments
 (0)