remove unused #define

[c11tester.git] / .gitignore

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