nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-07-16 15:58:50 +05:30
parent ad12fd75a8 4e6f49209f
commit 11475487fb
24 changed files with 462 additions and 1149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/crm/doctype/appointment/appointment.json
View File

@@ -102,7 +102,7 @@
}
],
"links": [],
"modified": "2021-06-30 12:09:14.228756",
"modified": "2021-06-30 13:09:14.228756",
"modified_by": "Administrator",
"module": "CRM",
"name": "Appointment",