Skip to content

Commit

Permalink
Merge branch 'master' of github.com:waderyan/vscode-atom-keybindings
Browse files Browse the repository at this point in the history
  • Loading branch information
Wade Anderson authored and Wade Anderson committed Jun 14, 2017
2 parents 4f7c350 + eeeb2f0 commit 7dca39e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
8 changes: 3 additions & 5 deletions out/src/extension.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion out/src/extension.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "atom-keybindings",
"displayName": "Atom Keymap",
"description": "Popular Atom keybindings for Visual Studio Code",
"version": "2.0.0",
"version": "2.0.1",
"publisher": "ms-vscode",
"engines": {
"vscode": "^1.6.0"
Expand Down
6 changes: 3 additions & 3 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as vscode from 'vscode';

export function activate(context: vscode.ExtensionContext) {
let config = vscode.workspace.getConfiguration('editor');
config.update('formatOnPaste', true);
config.update('minimap.enabled', true);
// let config = vscode.workspace.getConfiguration('editor');
// config.update('formatOnPaste', true);
// config.update('minimap.enabled', true);
}

0 comments on commit 7dca39e

Please sign in to comment.