Mercurial > hgrepos > Python > libs > ConfigMix
diff configmix/__init__.py @ 223:90dd0d04b926 v0.7.1
+++++ v0.7.1
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Fri, 10 May 2019 09:36:07 +0200 |
| parents | 6f0f39a9a46f |
| children | 8b1c52d5e7d5 |
line wrap: on
line diff
--- a/configmix/__init__.py Thu May 09 12:25:28 2019 +0200 +++ b/configmix/__init__.py Fri May 10 09:36:07 2019 +0200 @@ -13,7 +13,7 @@ from __future__ import division, print_function, absolute_import -__version__ = "0.7.1.dev1" +__version__ = "0.7.1" __revision__ = "|VCSRevision|" __date__ = "|VCSJustDate|" @@ -90,7 +90,7 @@ for f in files: ex = safe_merge(_load_cfg_from_file(f), ex) if extras: - ex = safe_merge(Configuration(extras), ex) + ex = safe_merge(Configuration(extras), ex) return Configuration(ex)
