From: Peter Barabas Date: Thu, 15 Sep 2016 11:03:11 +0000 (+0200) Subject: Remove extra empty line X-Git-Tag: colorado.2.rc1~23^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=91e6c25ac58f44130d2b04f4a930a9e272b5ae3b;p=fuel.git Remove extra empty line Change-Id: I462a99b42d05b979c4f1904e7309e87ddd94d1bb Signed-off-by: Peter Barabas (cherry picked from commit 2c7b9bb6623844eeea95373ec2752b0200cd69e8) --- diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index 436002d36..8896080db 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -137,7 +137,6 @@ def merge_networks(list_1, list_2): return [new_nets.get(net.get('name'), net) for net in list_1] - def merge_dicts(dict1, dict2): for k in set(dict1).union(dict2): if k in dict1 and k in dict2: