merging stuff...made need to clean up some stuff...but need to push it somewhere...

[c11tester.git] / .gitignore

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