Skip to content

Commit

Permalink
Merge pull request #141 from kroleg/patch-1
Browse files Browse the repository at this point in the history
Updated "VCS quick popup"
  • Loading branch information
kasecato committed Jan 10, 2019
2 parents af5f160 + 335027f commit 4e56cc1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
"url": "https://github.com/kasecato/vscode-intellij-idea-keybindings/issues"
},
"contributes": {
"keybindings": [
{
"keybindings": [{
"key": "ctrl+shift+enter",
"mac": "cmd+shift+enter",
"command": "acceptSelectedSuggestion",
Expand Down Expand Up @@ -742,7 +741,7 @@
{
"key": "ctrl+`",
"mac": "ctrl+v",
"command": "workbench.view.git",
"command": "workbench.view.scm",
"intellij": "‘VCS’ quick popup",
"todo": "no popup"
},
Expand Down
4 changes: 2 additions & 2 deletions src/package-with-comment.json
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@
{
"key": "ctrl+`",
"mac": "ctrl+v",
"command": "workbench.view.git",
"command": "workbench.view.scm",
"intellij": "‘VCS’ quick popup",
"todo": "no popup"
},
Expand Down Expand Up @@ -1644,4 +1644,4 @@
}
]
}
}
}

0 comments on commit 4e56cc1

Please sign in to comment.