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

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