From 70d5593aceca5a6aa5f86cab985f86d0bd0f02cd Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 13 Aug 2024 11:21:09 +0530 Subject: [PATCH] chore: resolve conflict --- .../process_statement_of_accounts.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json index 545ea22d799..22be5299280 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json @@ -393,11 +393,7 @@ } ], "links": [], -<<<<<<< HEAD - "modified": "2023-12-18 12:20:08.965120", -======= "modified": "2024-08-13 10:41:18.381165", ->>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts) "modified_by": "Administrator", "module": "Accounts", "name": "Process Statement Of Accounts",