no need to store into the object field... this will probably just lead to weird...

[c11tester.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f9a26768ae7410a9403f3d87bec5d3829bcb0ab9..d4b7fc44362fc1e7b3fe90cc1d994d68ca7a7a29 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,8 @@
 .*.swp
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
 
 # files in this directory
 /model
 /tags
+/docs