Compare commits
3 commits
1f9b434154
...
743418e6b1
Author | SHA1 | Date | |
---|---|---|---|
743418e6b1 | |||
8d124bbf81 | |||
b0faeab079 |
3 changed files with 3 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
|||
(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.4.1-SNAPSHOT"
|
||||
(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.4.2-SNAPSHOT"
|
||||
:description "Contains predicates and tools for c4k"
|
||||
:url "https://domaindrivenarchitecture.org"
|
||||
:license {:name "Apache License, Version 2.0"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
(defproject org.domaindrivenarchitecture/c4k-common-clj "6.4.1-SNAPSHOT"
|
||||
(defproject org.domaindrivenarchitecture/c4k-common-clj "6.4.2-SNAPSHOT"
|
||||
:description "Contains predicates and tools for c4k"
|
||||
:url "https://domaindrivenarchitecture.org"
|
||||
:license {:name "Apache License, Version 2.0"
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
only-config
|
||||
only-auth]
|
||||
(let [resulting-config (merge config-defaults my-config)
|
||||
both (not (or only-config only-auth))
|
||||
both (or (and only-config only-auth) (and (not only-config) (not only-auth)))
|
||||
res-vec (cond
|
||||
both (concat-vec (config-objects resulting-config) (auth-objects my-auth))
|
||||
only-config (config-objects my-config)
|
||||
|
|
Loading…
Reference in a new issue