From 80741ceb679ba7b3f612f4f4abb54433a2c324c5 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Mon, 15 Jun 2026 14:39:29 +0530 Subject: [PATCH] chore: resolve conflicts --- .../currency_exchange_settings.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json index 388546dcf56..a3aea6016b9 100644 --- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json +++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json @@ -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",