nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-16 07:58:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Diptanil Saha
2026-06-15 14:39:29 +05:30
committed by GitHub
parent 9405b49e93
commit 80741ceb67
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
View File

@@ -104,15 +104,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2025-11-25 13:03:41.896424",
=======
"modified": "2026-06-09 11:34:10.432378",
>>>>>>> 56bfe6b6a6 (feat(currency exchange settings): frankfurter v2 support)
=======
"modified": "2026-06-15 11:25:55.873110",
>>>>>>> 0c2d5488a6 (fix: restricting currency_exchange_settings write permission only to system manager)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Currency Exchange Settings",