From 7cbe03174f8f53e254a7be275f1a805a011e3f58 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 17 May 2024 10:37:32 +0530 Subject: [PATCH] chore: resolve conflicts --- .../doctype/accounts_settings/accounts_settings.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 663a9e990d1..7bf3826e781 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -469,19 +469,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD -<<<<<<< HEAD - "modified": "2024-03-15 12:11:36.085158", -======= -<<<<<<< HEAD - "modified": "2024-01-30 14:04:26.553554", -======= "modified": "2024-05-11 23:19:44.673975", ->>>>>>> d56f52b0ba (feat: Config to enable immutable ledger) ->>>>>>> 32c935bc30 (feat: Config to enable immutable ledger) -======= - "modified": "2024-05-11 23:19:44.673975", ->>>>>>> 9315607ee7 (chore: Resolve conflicts) "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings",