Merge branch 'Eyas-vscode-ignores'

Conflicts: .npmignore
2026-03-15 05:55:11 -05:00 · 2015-09-28 15:06:12 -07:00
parent 85a29d2c1a 20eaa22b02
commit c55d6dc0e3
2 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -50,5 +50,6 @@ scripts/typings/
 coverage/
 internal/
 **/.DS_Store
-.settings/*
-!.settings/tasks.json
+.settings
+.vscode/*
+!.vscode/tasks.json
--- a/.npmignore
+++ b/.npmignore
@@ -6,4 +6,4 @@ tests
 Jakefile.js
 .travis.yml
 .settings/
-.vscode/
+.vscode/