From 0685a9241e022d1997147c704a552a7726ddb7f4 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 6 Mar 2026 12:44:55 +0530 Subject: [PATCH] chore: fix conflicts Remove merge conflict markers and update patch list. --- erpnext/patches.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 3b8c6acd836..dfff6af431a 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -468,8 +468,5 @@ erpnext.patches.v15_0.replace_http_with_https_in_sales_partner erpnext.patches.v15_0.delete_quotation_lost_record_detail erpnext.patches.v16_0.add_portal_redirects erpnext.patches.v16_0.complete_onboarding_steps_for_older_sites #2 -<<<<<<< HEAD erpnext.patches.v16_0.update_order_qty_and_requested_qty_based_on_mr_and_po -======= erpnext.patches.v16_0.enable_serial_batch_setting ->>>>>>> 82c3da5b1e (feat: option to enable serial / batch features)