From 2b736b52d6950dc9d396fd0690214c25483a478d Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 23 Apr 2024 15:33:25 +0530 Subject: [PATCH] chore: resolve conflicts --- .../payment_reconciliation/payment_reconciliation.json | 4 ---- erpnext/setup/doctype/company/company.json | 4 ---- 2 files changed, 8 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json index 9ceafd21bd9..219d6089a57 100644 --- 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", diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index 59c53c73b84..c222d6b96a7 100644 --- 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",