From faba5230862d02131c5ad6cf60e5b500e7daa2cb Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 11 Aug 2025 11:41:10 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/patches.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index bf3326cd976..1087f64276d 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -416,10 +416,7 @@ erpnext.patches.v15_0.update_payment_ledger_entries_against_advance_doctypes erpnext.patches.v15_0.rename_price_list_to_buying_price_list erpnext.patches.v15_0.patch_missing_buying_price_list_in_material_request erpnext.patches.v15_0.remove_sales_partner_from_consolidated_sales_invoice -<<<<<<< HEAD erpnext.patches.v15_0.repost_gl_entries_with_no_account_subcontracting #2025-08-04 execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_for_internal_transaction", 1) erpnext.patches.v15_0.add_company_payment_gateway_account -======= erpnext.patches.v15_0.update_uae_zero_rated_fetch ->>>>>>> b8224693c4 (fix(regional-uae): mark export items as zero rated)