chore: resolve conflicts

2026-02-15 23:54:59 +00:00 · 2024-08-24 12:38:11 +05:30
parent 5186872b9b
commit 3a02800fbc
1 changed files with 0 additions and 4 deletions
--- 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",