X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=.gitignore;h=f9a26768ae7410a9403f3d87bec5d3829bcb0ab9;hb=810306cb85accaaace9a50f174264f105991230b;hp=ab5a84ad8ea49a161901625cf3fd22202a3d5851;hpb=96598fb588eae2fa5050ab83cb3e362f2d6cbbec;p=model-checker.git

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