Ignore the .vs directory

[rbdr/super-polarity] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3d43fd7fad75d3014ba7842fde4e575e48c6958a..6415af8887c269f87979f38ebbe724f25082c9b7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Object files
 *.o
 
@@ -166,6 +165,8 @@ Desktop.ini
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-# Mac crap
+# Mac files
 .DS_Store
->>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a
+
+# Visual Studio dir
+.vs