Merge branch 'master' of github.com:benbeltran/super-polarity

[rbdr/super-polarity] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0881b8de93b832bb77df563532afe54187a17eb3..3d43fd7fad75d3014ba7842fde4e575e48c6958a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,22 @@
+<<<<<<< HEAD
+# Object files
+*.o
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+=======
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
@@ -149,3 +168,4 @@ $RECYCLE.BIN/
 
 # Mac crap
 .DS_Store
+>>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a