nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-09 15:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
AarDG10
2026-09-01 12:55:27 +05:30
parent 0cef90d079
commit 2f2a9301d8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/patches.txt
View File

@@ -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