summaryrefslogtreecommitdiffstats
path: root/deploy/deploy-config.py
diff options
context:
space:
mode:
authorPeter Barabas <peter.barabas@ericsson.com>2016-09-15 13:03:11 +0200
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-09-20 21:12:12 +0000
commit91e6c25ac58f44130d2b04f4a930a9e272b5ae3b (patch)
treee6083ca20c5c51284ac4f4a69637bc244c1c9925 /deploy/deploy-config.py
parentd1dd9f9d570e4fa9cc3be53f9072f12efeb474cd (diff)
Remove extra empty line
Change-Id: I462a99b42d05b979c4f1904e7309e87ddd94d1bb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 2c7b9bb6623844eeea95373ec2752b0200cd69e8)
Diffstat (limited to 'deploy/deploy-config.py')
-rw-r--r--deploy/deploy-config.py1
1 files changed, 0 insertions, 1 deletions
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: