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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-04-23 15:33:25 +05:30
parent 24954b909b
commit 2b736b52d6
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
View File

@@ -231,11 +231,7 @@
"is_virtual": 1, "is_virtual": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-12-14 13:38:16.264013",
=======
"modified": "2024-04-23 12:38:29.557315", "modified": "2024-04-23 12:38:29.557315",
>>>>>>> de9c8fc9d6 (refactor: better description for advance account)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation", "name": "Payment Reconciliation",

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

@@ -786,11 +786,7 @@
"image_field": "company_logo", "image_field": "company_logo",
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-09-10 21:53:13.860791",
=======
"modified": "2024-04-23 12:38:33.173938", "modified": "2024-04-23 12:38:33.173938",
>>>>>>> de9c8fc9d6 (refactor: better description for advance account)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",