From 9ee421424fb2c970476419ae379d80178ac4cf27 Mon Sep 17 00:00:00 2001 From: AarDG10 Date: Tue, 1 Sep 2026 12:51:04 +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 928749abbd0..4948c6916f6 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -502,11 +502,7 @@ erpnext.patches.v16_0.recalculate_purchase_receipt_billing_status erpnext.patches.v16_0.add_currency_to_blanket_orders erpnext.patches.v16_0.repair_work_order_material_transfer erpnext.patches.v16_0.remove_frappe_crm_custom_fields -<<<<<<< HEAD erpnext.patches.v16_0.rename_secondary_item_type_field erpnext.patches.v16_0.append_fieldname_to_pos_search_fields erpnext.patches.v16_0.set_secondary_item_valuation_type -======= -erpnext.patches.v16_0.add_batch_split_stock_entry_type erpnext.patches.v16_0.add_transaction_roles_to_sms_settings ->>>>>>> 3501beb (fix(sms_settings): add patch to pre-fill roles into SMS Settings Roles Table)