CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 07:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-12-23 11:14:27 +05:30
parent e6390bfba1
commit 3d4a4e661c
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,11 +38,7 @@
"table_fieldname": "competitors"
}
],
<<<<<<< HEAD
"modified": "2023-11-23 19:33:54.284279",
=======
"modified": "2024-12-10 08:26:38.496003",
>>>>>>> 4d5241486f (fix: permissions for marking Quotation as lost)
"modified_by": "Administrator",
"module": "CRM",
"name": "Competitor",

4
erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
View File

@@ -32,11 +32,7 @@
"table_fieldname": "lost_reasons"
}
],
<<<<<<< HEAD
"modified": "2023-11-23 19:31:02.743353",
=======
"modified": "2024-12-10 08:21:38.280627",
>>>>>>> 4d5241486f (fix: permissions for marking Quotation as lost)
"modified_by": "Administrator",
"module": "Setup",
"name": "Quotation Lost Reason",