From 3a02800fbce6faee7784a6158f2f6b528aa2f157 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Sat, 24 Aug 2024 12:38:11 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/crm/doctype/opportunity/opportunity.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json index 8ca7bcf5c7e..75373398b09 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.json +++ b/erpnext/crm/doctype/opportunity/opportunity.json @@ -625,11 +625,7 @@ "icon": "fa fa-info-sign", "idx": 195, "links": [], -<<<<<<< HEAD - "modified": "2022-10-13 12:42:21.545636", -======= "modified": "2024-08-20 04:12:29.095761", ->>>>>>> 74afa57a9f (fix: do not copy date fields in opportunity doctype) "modified_by": "Administrator", "module": "CRM", "name": "Opportunity",