CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 17:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Solve merge conflict in patches.txt

Browse Source
This commit is contained in:
Marica
2022-02-18 19:27:11 +05:30
committed by GitHub
parent 6cf1049495
commit 104d3e1019
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/patches.txt
View File

@@ -350,15 +350,4 @@ erpnext.patches.v13_0.enable_provisional_accounting
erpnext.patches.v13_0.update_disbursement_account
erpnext.patches.v13_0.update_reserved_qty_closed_wo
erpnext.patches.v13_0.amazon_mws_deprecation_warning
<<<<<<< HEAD
=======
<<<<<<< HEAD
erpnext.patches.v13_0.amazon_mws_deprecation_warning
=======
erpnext.patches.v14_0.delete_amazon_mws_doctype
erpnext.patches.v14_0.set_work_order_qty_in_so_from_mr
>>>>>>> 0ca58d7627 (chore: Patch to update SO work_order_qty and Linter fix)
>>>>>>> 98ce6a1c8d (chore: Patch to update SO work_order_qty and Linter fix)
=======
erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
>>>>>>> 94a1016623 (chore: Move patch that updates SO from WO to v13)