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

fix: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2026-02-25 23:14:34 +05:30
committed by GitHub
parent 6f5a741719
commit 4ea3e9d1ef
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@@ -465,9 +465,6 @@ erpnext.patches.v16_0.set_ordered_qty_in_quotation_item
erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2 erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2
erpnext.patches.v16_0.update_company_custom_field_in_bin erpnext.patches.v16_0.update_company_custom_field_in_bin
erpnext.patches.v15_0.replace_http_with_https_in_sales_partner erpnext.patches.v15_0.replace_http_with_https_in_sales_partner
<<<<<<< HEAD
erpnext.patches.v15_0.delete_quotation_lost_record_detail erpnext.patches.v15_0.delete_quotation_lost_record_detail
erpnext.patches.v16_0.add_portal_redirects erpnext.patches.v16_0.add_portal_redirects
=======
erpnext.patches.v16_0.migrate_asset_type_checkboxes_to_select erpnext.patches.v16_0.migrate_asset_type_checkboxes_to_select
>>>>>>> c36fa5bdb6 (fix: patch to migrate checkbox data into select)