Merge branch 'js/visual-studio'

diff --git a/.gitignore b/.gitignore
index 521d8f4fb421c25e5f733242796fddfa47f39f93..fc445edea9d3497b72c16629b0729c75d1ebae28 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -231,7 +231,6 @@
 *.ipdb
 *.dll
 .vs/
-*.manifest
 Debug/
 Release/
 /UpgradeLog*.htm