From 113da4f51204e7d69e876a0f6faf7d732819a1d1 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Thu, 11 Dec 2025 15:59:57 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/patches.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index b58742e414c..1574c540100 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -424,17 +424,6 @@ erpnext.patches.v15_0.update_uae_zero_rated_fetch erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter erpnext.patches.v15_0.set_asset_status_if_not_already_set erpnext.patches.v15_0.toggle_legacy_controller_for_period_closing -<<<<<<< HEAD execute:frappe.db.set_single_value("Accounts Settings", "show_party_balance", 1) execute:frappe.db.set_single_value("Accounts Settings", "show_account_balance", 1) -erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter -======= -erpnext.patches.v16_0.update_serial_batch_entries -erpnext.patches.v16_0.set_company_wise_warehouses -erpnext.patches.v16_0.set_valuation_method_on_companies -erpnext.patches.v15_0.migrate_old_item_wise_tax_detail_data_to_table -erpnext.patches.v16_0.migrate_budget_records_to_new_structure erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter #2025-12-11 -erpnext.patches.v16_0.migrate_account_freezing_settings_to_company -erpnext.patches.v16_0.populate_budget_distribution_total ->>>>>>> 5c2bb66028 (fix(currency exchange settings): added backward compatibility for frankfurter api)