summaryrefslogtreecommitdiff
path: root/ishtar_common/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/utils.py')
-rw-r--r--ishtar_common/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index 137f89469..b7a78a226 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -263,6 +263,8 @@ def update_data(data_1, data_2, merge=False):
if data_2 and not data_1:
return data_2
if not merge:
+ if data_2:
+ return data_2
return data_1
if data_2 and data_2 != data_1:
return data_1 + " ; " + data_2