nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 05:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source 
(cherry picked from commit 9315607ee7)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
This commit is contained in:
Deepesh Garg
2024-05-16 20:59:47 +05:30
committed by Mergify
parent f09a6d76a7
commit ce60b77fa5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,6 +469,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2024-03-15 12:11:36.085158", "modified": "2024-03-15 12:11:36.085158",
======= =======
@@ -478,6 +479,9 @@
"modified": "2024-05-11 23:19:44.673975", "modified": "2024-05-11 23:19:44.673975",
>>>>>>> d56f52b0ba (feat: Config to enable immutable ledger) >>>>>>> d56f52b0ba (feat: Config to enable immutable ledger)
>>>>>>> 32c935bc30 (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",