From a29df7be67922b659157f68e2d54ecbaf7ca1264 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sat, 31 Jan 2026 20:13:26 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/patches.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index d5c60e0a61f..1c7a55906ff 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -458,9 +458,5 @@ erpnext.patches.v16_0.update_corrected_cancelled_status erpnext.patches.v16_0.fix_barcode_typo erpnext.patches.v16_0.set_post_change_gl_entries_on_pos_settings execute:frappe.delete_doc_if_exists("Workspace Sidebar", "Opening & Closing") -<<<<<<< HEAD erpnext.patches.v15_0.create_accounting_dimensions_in_advance_taxes_and_charges -======= -erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2 erpnext.patches.v16_0.set_ordered_qty_in_quotation_item ->>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation)