Combine the gitignore files
Signed-off-by: Gavin Howard <gavin@yzena.com>
diff --git a/.gitignore b/.gitignore
index ca54127..3f32784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,5 +76,9 @@
tags
*.vcxproj.user
-Debug/*
-Release/*
+vs/.vs/*
+vs/bin/*
+vs/lib/*
+vs/src2/*
+vs/tests/*.txt
+vs/tests/*.exe
diff --git a/vs/.gitignore b/vs/.gitignore
deleted file mode 100644
index 81ec6e0..0000000
--- a/vs/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.vcxproj.user
-.vs/*
-bin/*
-lib/*
-src2/*
-tests/*.txt
-tests/*.exe
\ No newline at end of file
