From 2f2a9301d8fe4392f2883b9a84abfba7af27972c Mon Sep 17 00:00:00 2001 From: AarDG10 Date: Tue, 1 Sep 2026 12:55:27 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/patches.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 6161957523f..d5a7ff156d3 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -449,9 +449,5 @@ erpnext.patches.v16_0.backfill_repost_accounting_ledger_status erpnext.patches.v16_0.merge_seeded_item_group_root erpnext.patches.v16_0.repair_work_order_material_transfer erpnext.patches.v16_0.remove_frappe_crm_custom_fields -<<<<<<< HEAD erpnext.patches.v16_0.append_fieldname_to_pos_search_fields -======= -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) +erpnext.patches.v16_0.add_transaction_roles_to_sms_settings \ No newline at end of file