remove unused #define

[c11tester.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 66dc45e004545d033b7b426868134f6035fe0457..f9a26768ae7410a9403f3d87bec5d3829bcb0ab9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,13 @@
 # generic types
 *.o
 .*.swp
+*.so
+*~
+<<<<<<< HEAD
+=======
+*.*~
+>>>>>>> subramanian
 
 # files in this directory
-/libthreads
+/model
 /tags