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

chore: fix conflicts

Browse Source 
Remove merge conflict markers and update patch list.
This commit is contained in:
rohitwaghchaure
2026-03-06 12:44:55 +05:30
committed by GitHub
parent 93a597410e
commit 0685a9241e
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

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