Merge release Beta 1 into stable #21
1 changed files with 1 additions and 1 deletions
|
@ -66,5 +66,5 @@
|
|||
val2 (get defaults k)]
|
||||
(if (and (map? val1)
|
||||
(map? val2))
|
||||
{k (map-deep-merge-missing val1 val2)}
|
||||
{k (map-apply-defaults val1 val2)}
|
||||
{k (nil?-else val2 val1)})))))
|
||||
|
|
Loading…
Reference in a new issue