Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ignacy Moryc 2012-09-23 15:44:03 +02:00
commit dc0272de80
2 changed files with 5 additions and 3 deletions

1
.gitignore vendored
View file

@ -2,6 +2,7 @@ bin
classes classes
lib lib
releases releases
target
*.jar *.jar
.DS_Store .DS_Store
.lein-deps-sum .lein-deps-sum

View file

@ -1,6 +1,7 @@
(defproject functional-koans "0.4.5" (defproject clojure-koans "0.4.5"
:description "The functional koans." :description "The Clojure koans."
:dependencies [[org.clojure/clojure "1.3.0"] :dependencies [[org.clojure/clojure "1.3.0"]
[koan-engine "0.1.2-SNAPSHOT"]] [koan-engine "0.1.2-SNAPSHOT"]]
:dev-dependencies [[swank-clojure "1.3.0" :exclusions [org.clojure/clojure]] :dev-dependencies [[swank-clojure "1.3.0" :exclusions [org.clojure/clojure]]
[lein-koan "0.1.0"]]) [lein-koan "0.1.0"]]
:main koan-engine.runner/exec)