diff --git a/mycroft/configuration/__init__.py b/mycroft/configuration/__init__.py index e74062ad99..b77f05c63a 100644 --- a/mycroft/configuration/__init__.py +++ b/mycroft/configuration/__init__.py @@ -99,6 +99,14 @@ class ConfigurationLoader(object): @staticmethod def merge_conf(base, delta): + """ + Recursively merging configuration dictionaries. + + Args: + base: Target for merge + delta: Dictionary to merge into base + """ + for k, dv in delta.iteritems(): bv = base.get(k) if isinstance(dv, dict) and isinstance(bv, dict):