clockvector: add print() method

[c11tester.git] / .gitignore

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