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

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