mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-15 19:19:17 +00:00
fixed conflicts
This commit is contained in:
@@ -846,7 +846,7 @@
|
||||
"issingle": 0,
|
||||
"istable": 0,
|
||||
"max_attachments": 0,
|
||||
"modified": "2019-03-21 16:26:45.447265",
|
||||
"modified": "2019-10-14 16:26:45.447265",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Setup",
|
||||
"name": "Sales Partner",
|
||||
|
||||
Reference in New Issue
Block a user