nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-05-17 10:37:32 +05:30
committed by GitHub
parent ce60b77fa5
commit 7cbe03174f
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -469,19 +469,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "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", "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", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",