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

diff --git a/.gitignore b/.gitignore
index f9a2676..c344192 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,12 @@
 # generic types
 *.o
 .*.swp
+*.swo
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
+*.dot
 
 # files in this directory
-/model
 /tags
+/doc/docs
+/make.deps