From 1ad2f065007c789262c662871338601e63bf4148 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 23 May 2024 17:48:44 +0530 Subject: [PATCH] chore: resolve conflicts --- .../repost_accounting_ledger/repost_accounting_ledger.json | 4 ---- .../doctype/repost_payment_ledger/repost_payment_ledger.json | 4 ---- 2 files changed, 8 deletions(-) diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json index cef88965f6b..f9344ce4f3a 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json +++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json @@ -53,11 +53,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-09-26 14:21:27.362567", -======= "modified": "2024-05-23 17:00:42.984798", ->>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes) "modified_by": "Administrator", "module": "Accounts", "name": "Repost Accounting Ledger", diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json index 84205990dda..4ecff8cac3b 100644 --- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json +++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json @@ -98,11 +98,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-09-26 14:21:35.719727", -======= "modified": "2024-05-23 17:00:31.540640", ->>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes) "modified_by": "Administrator", "module": "Accounts", "name": "Repost Payment Ledger",