From 75ea09f9df629ac9ea391e489106c65cf2616e0d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 17 May 2021 11:35:48 +0530 Subject: [PATCH] fix: Resolved conflict issue --- frappe/utils/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index d74186aa02..1ba09ef776 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -402,7 +402,9 @@ def encode_dict(d, encoding="utf-8"): def decode_dict(d, encoding="utf-8"): for key in d: if isinstance(d[key], str) and not isinstance(d[key], str): + d[key] = d[key].decode(encoding, "ignore") return d + @functools.lru_cache() def get_site_name(hostname): return hostname.split(':')[0]