remove unused #define

[c11tester.git] / .gitignore

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