chore: Resolve conflicts

2026-03-16 08:47:33 +00:00 · 2024-05-16 20:59:47 +05:30
parent 983c55eca1
commit 9315607ee7
1 changed files with 0 additions and 4 deletions
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -469,11 +469,7 @@
 "index_web_pages_for_search": 1,
 "issingle": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2024-01-30 14:04:26.553554",
-=======
 "modified": "2024-05-11 23:19:44.673975",
->>>>>>> d56f52b0ba (feat: Config to enable immutable ledger)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Accounts Settings",