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

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