schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-02-23 11:10:07 +05:30
committed by GitHub
parent 259a091a37
commit d1049b0d00
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches.txt
View File

@@ -349,10 +349,6 @@ erpnext.patches.v13_0.update_sane_transfer_against
erpnext.patches.v13_0.enable_provisional_accounting
erpnext.patches.v13_0.update_disbursement_account
erpnext.patches.v13_0.update_reserved_qty_closed_wo
<<<<<<< HEAD
erpnext.patches.v13_0.amazon_mws_deprecation_warning
erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
=======
erpnext.patches.v14_0.delete_amazon_mws_doctype
erpnext.patches.v13_0.update_accounts_in_loan_docs
>>>>>>> a0bdcbd0cd (fix: Add patch for account fields)