summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-09-26 16:47:51 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-26 16:47:51 +0000
commit0a4bad20dcca5e0f8b9ab577b0ccdd3e38a3db86 (patch)
tree4555c78d617ab5d6786d5c8ad5fb3c1d6c757fd2
parent60ced1854eaa8c3c8f1211c4b43f2a20b3a58e9d (diff)
parent91e6c25ac58f44130d2b04f4a930a9e272b5ae3b (diff)
Merge "Remove extra empty line" into stable/colorado
-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: