Merge branch 'Eyas-vscode-ignores'

Conflicts:
	.npmignore
This commit is contained in:
Mohamed Hegazy committed 2015-09-28 15:06:12 -07:00
commit c55d6dc0e3
2 files changed
+4 -3

No files matched your search

+3 -2
View File
@@ -50,5 +50,6 @@ scripts/typings/
coverage/
internal/
**/.DS_Store
.settings/*
!.settings/tasks.json
.settings
.vscode/*
!.vscode/tasks.json
+1 -1
View File
@@ -6,4 +6,4 @@ tests
Jakefile.js
.travis.yml
.settings/
.vscode/
.vscode/