Skip to content
Browse files

Merge branch 'master' into asylum

  • Loading branch information...
2 parents 788453a + 911155c commit e174b33b11765be54ff67abe12f0d3096bb6ffc9 @algernon committed Aug 4, 2012
Showing with 2 additions and 7 deletions.
  1. +1 −1 project.clj
  2. +1 −6 src/madness/config.clj
View
2 project.clj
@@ -5,7 +5,7 @@
:url "http://www.gnu.org/licenses/gpl.txt"
:distribution :repo}
:min-lein-version "2.0.0"
- :dependencies [[org.clojure/clojure "1.3.0"]
+ :dependencies [[org.clojure/clojure "1.4.0"]
[enlive/enlive "1.0.0"]
[clj-time "0.4.3"]
[org.clojars.amit/commons-io "1.4.0"]
View
7 src/madness/config.clj
@@ -45,12 +45,7 @@
(def config
"The final configuration for Madness - `settings.clj` merged into
the `default-config`."
- (reduce
- (fn [o, n]
- (let [k (first n), vo (second o), vn (second n)]
- (update-in o [k] merge vn)))
- default-config
- (eval (read-string (slurp "settings.clj")))))
+ (merge-with merge default-config (eval (read-string (slurp "settings.clj")))))
(defn template
"Get the location of a template. Without arguments, returns the

0 comments on commit e174b33

Please sign in to comment.
Something went wrong with that request. Please try again.