From 70859ba621535636c33e0044fe26a4e943516fae Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 3 Apr 2017 21:11:51 +0530 Subject: [PATCH] Remove conflict --- frappe/custom/doctype/custom_script/custom_script.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/custom/doctype/custom_script/custom_script.json b/frappe/custom/doctype/custom_script/custom_script.json index 102e168d2d..644fcb7986 100644 --- a/frappe/custom/doctype/custom_script/custom_script.json +++ b/frappe/custom/doctype/custom_script/custom_script.json @@ -87,11 +87,8 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, -<<<<<<< HEAD -======= + "in_filter": 0, "in_global_search": 0, ->>>>>>> Hide script field from List View "in_list_view": 0, "in_standard_filter": 0, "label": "Script",