Merge branch 'Eyas-vscode-ignores'

mhegazy · mhegazy · commit c55d6dc0e3d9 · 2015-09-28T15:06:12.000-07:00
Conflicts:
	.npmignore
diff --git a/.gitignore b/.gitignore
@@ -50,5 +50,6 @@ scripts/typings/
 coverage/
 internal/
 **/.DS_Store
-.settings/*
-!.settings/tasks.json
+.settings
+.vscode/*
+!.vscode/tasks.json
diff --git a/.npmignore b/.npmignore
@@ -6,4 +6,4 @@ tests
 Jakefile.js
 .travis.yml
 .settings/
-.vscode/
+.vscode/
