X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=.gitignore;h=8df986236c0ce4c60c181b23194f9db1b1d879f3;hp=f9a26768ae7410a9403f3d87bec5d3829bcb0ab9;hb=1c9f756acfac5eb9bc4fba73967e73e2aafa8323;hpb=810306cb85accaaace9a50f174264f105991230b

diff --git a/.gitignore b/.gitignore
index f9a2676..8df9862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,15 @@
 # generic types
 *.o
-.*.swp
+*.swp
+*.swo
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
+*.dot
+.*.d
+*.pdf
 
 # files in this directory
-/model
 /tags
+/doc/docs
+/benchmarks
+/README.html