remove unused #define

[c11tester.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6223e7e247fe260fa7f4aa31f9203c88dace4695..f9a26768ae7410a9403f3d87bec5d3829bcb0ab9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,10 @@
 .*.swp
 *.so
 *~
+<<<<<<< HEAD
+=======
 *.*~
+>>>>>>> subramanian
 
 # files in this directory
 /model