From b84531d4eaa3994ed465444700080104c8e04673 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 10 Dec 2025 11:59:14 +0530
Subject: [PATCH] fix: conflicts

---
 erpnext/patches.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 5eba5fe2711..83dca1839fb 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -449,9 +449,4 @@ 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
-<<<<<<< HEAD
-=======
-erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter
-erpnext.patches.v16_0.migrate_account_freezing_settings_to_company
 erpnext.patches.v16_0.populate_budget_distribution_total
->>>>>>> ed4c17d3a2 (fix: patch to set budget distribution total)