From 86d2989c52ddefb2cb970bbf718c3f892cae2225 Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Sat, 8 May 2021 12:39:27 +0530
Subject: [PATCH] fix: Avoid possible whitespace bug

* Handles semgrep warning
* Changed "" to None as a precaution against future whitespace bugs via human error

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit c84feb16e9e456cdd040f20a6ac154d3a1d760c0)
---
 frappe/core/doctype/doctype/doctype.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index e0b9d15114..6eef5a4023 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -123,7 +123,7 @@ class DocType(Document):
 		}
 
 		for docfield in self.get("fields") or []:
-			conflict_type = ""
+			conflict_type = None
 			field = docfield.fieldname
 			field_label = docfield.label or docfield.fieldname