Compare commits

..

No commits in common. "743418e6b1bced1c60000fc950ba08675cef4e55" and "1f9b434154441d74f416cb47d0554ddafd4e35c5" have entirely different histories.

3 changed files with 3 additions and 3 deletions

View file

@ -1,4 +1,4 @@
(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.4.2-SNAPSHOT"
(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.4.1-SNAPSHOT"
:description "Contains predicates and tools for c4k"
:url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0"

View file

@ -1,4 +1,4 @@
(defproject org.domaindrivenarchitecture/c4k-common-clj "6.4.2-SNAPSHOT"
(defproject org.domaindrivenarchitecture/c4k-common-clj "6.4.1-SNAPSHOT"
:description "Contains predicates and tools for c4k"
:url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0"

View file

@ -59,7 +59,7 @@
only-config
only-auth]
(let [resulting-config (merge config-defaults my-config)
both (or (and only-config only-auth) (and (not only-config) (not only-auth)))
both (not (or only-config only-auth))
res-vec (cond
both (concat-vec (config-objects resulting-config) (auth-objects my-auth))
only-config (config-objects my-config)