nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Raffael Meyer
2023-12-14 13:51:47 +01:00
committed by GitHub
parent 1469ca7d0b
commit 2c52f2ce13
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/doctype/lead/lead.json
View File

@@ -514,11 +514,7 @@
"idx": 5, "idx": 5,
"image_field": "image", "image_field": "image",
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-10-13 12:42:04.277879",
=======
"modified": "2023-12-01 18:46:49.468526", "modified": "2023-12-01 18:46:49.468526",
>>>>>>> ceeb724acc (feat: set lead name from email)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Lead", "name": "Lead",