# HG changeset patch
# User Franz Glasner <f.glasner@feldmann-mg.com>
# Date 1457518173 -3600
# Node ID 6835a5663008d3f8950a7cdeb9c227acdd1ce2e2
# Parent  7090c295c940efa898892f9f2c6c7c4852385073
FIX: Style

diff -r 7090c295c940 -r 6835a5663008 configmix/__init__.py
--- a/configmix/__init__.py	Wed Mar 09 09:05:41 2016 +0100
+++ b/configmix/__init__.py	Wed Mar 09 11:09:33 2016 +0100
@@ -35,7 +35,7 @@
     result = deepcopy(a)
     for k, v in b.iteritems():
         if k in result and isinstance(result[k], dict):
-                result[k] = dict_merge(result[k], v)
+            result[k] = dict_merge(result[k], v)
         else:
             result[k] = deepcopy(v)
     return result
@@ -48,7 +48,7 @@
 
     """
     if isinstance(user, dict) and isinstance(default, dict):
-        for k,v in default.items():
+        for k, v in default.items():
             if k not in user:
                 user[k] = v
             else: