chore: resolve conflicts

2026-03-16 00:37:15 +00:00 · 2024-04-23 15:33:25 +05:30
parent 24954b909b
commit 2b736b52d6
2 changed files with 0 additions and 8 deletions
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -231,11 +231,7 @@
 "is_virtual": 1,
 "issingle": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2023-12-14 13:38:16.264013",
-=======
 "modified": "2024-04-23 12:38:29.557315",
->>>>>>> de9c8fc9d6 (refactor: better description for advance account)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Payment Reconciliation",
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -786,11 +786,7 @@
 "image_field": "company_logo",
 "is_tree": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-10 21:53:13.860791",
-=======
 "modified": "2024-04-23 12:38:33.173938",
->>>>>>> de9c8fc9d6 (refactor: better description for advance account)
 "modified_by": "Administrator",
 "module": "Setup",
 "name": "Company",