consistent use of config defaults
This commit is contained in:
parent
2154bed190
commit
b62fa7b9ec
1 changed files with 3 additions and 3 deletions
|
@ -61,9 +61,9 @@
|
|||
(let [resulting-config (merge config-defaults my-config)
|
||||
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-config my-auth))
|
||||
only-config (config-objects my-config)
|
||||
only-auth (auth-objects my-config my-auth))]
|
||||
both (concat-vec (config-objects resulting-config) (auth-objects resulting-config my-auth))
|
||||
only-config (config-objects resulting-config)
|
||||
only-auth (auth-objects resulting-config my-auth))]
|
||||
(cs/join
|
||||
"\n---\n"
|
||||
res-vec)))
|
||||
|
|
Loading…
Reference in a new issue