Merge branch 'master' of https://github.com/grrowl/dotfiles

Code/User/keybindings.json

@@ -56,5 +56,13 @@
   {
     "key": "cmd+h",
     "command": "workbench.files.action.collapseExplorerFolders"
+  },
+  {
+    "key": "cmd+, cmd+,",
+    "command": "workbench.action.openSettings"
+  },
+  {
+    "key": "cmd+,",
+    "command": "-workbench.action.openSettings"
   }
 ]

Code/User/settings.json

@@ -36,7 +36,6 @@
         "editor.wordWrap": "on"
     },
     // "editor.glyphMargin": false,
-    "editor.snippetSuggestions": "top",
     "search.useIgnoreFiles": true,
     "explorer.confirmDelete": false,
     "problems.decorations.enabled": true,
@@ -222,4 +221,6 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "vtools.autoHideSideBar": true
+    "emmet.triggerExpansionOnTab": true,
+    "merge-conflict.autoNavigateNextConflict.enabled": true
 }