status-im
/
timbre
mirror of https://github.com/status-im/timbre.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#163] Fix surprising `merge-config` nil behaviour

This commit is contained in:
Peter Taoussanis 2016-04-16 11:18:36 +07:00
parent 32d6892747
commit b86eb0d0e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.clj
View File

@ -12,7 +12,7 @@
:dependencies
[[org.clojure/clojure "1.5.1"]
[com.taoensso/encore "2.36.2"]
[com.taoensso/encore "2.50.0"]
[io.aviso/pretty "0.1.26"]]
:plugins

4
src/taoensso/timbre.cljx
View File

@ -18,8 +18,8 @@
(:require-macros [taoensso.timbre :as timbre-macros :refer ()]))
(if (vector? taoensso.encore/encore-version)
(enc/assert-min-encore-version [2 33 0])
(enc/assert-min-encore-version 2.33))
(enc/assert-min-encore-version [2 50 0]) ; For nested-merge fixes
(enc/assert-min-encore-version 2.50))
;;;; Config