Permalink
Browse files

Merged master

  • Loading branch information...
2 parents 0aff847 + 7fa678e commit 73aa7f7fa81fe19649c96f1b19e3943eb3600bda @liebke liebke committed Oct 8, 2011
Showing with 182 additions and 156 deletions.
  1. +2 −1 .gitignore
  2. +153 −154 modules/incanter-core/src/incanter/core.clj
  3. +27 −1 modules/incanter-latex/src/incanter/latex.clj
View
@@ -7,5 +7,6 @@ lib
classes
*.jar
*.log
+<<<<<<< HEAD
.cake
-.lein-failures
+.lein*
Oops, something went wrong.

0 comments on commit 73aa7f7

Please sign in to comment.