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

chore: resolve merge conflict

Browse Source
This commit is contained in:
Raffael Meyer
2022-11-28 18:51:40 +01:00
committed by GitHub
parent 6c3fbf03f9
commit 7477bb96c8
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches.txt
View File

@@ -316,11 +316,6 @@ erpnext.patches.v14_0.create_accounting_dimensions_in_subcontracting_doctypes
erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries
erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger
erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
<<<<<<< HEAD
erpnext.patches.v13_0.update_schedule_type_in_loans erpnext.patches.v13_0.update_schedule_type_in_loans
erpnext.patches.v14_0.update_partial_tds_fields erpnext.patches.v14_0.update_partial_tds_fields
=======
erpnext.patches.v14_0.update_tds_fields
erpnext.patches.v14_0.create_incoterms_and_migrate_shipment erpnext.patches.v14_0.create_incoterms_and_migrate_shipment
>>>>>>> d2563ee973 (feat: create incoterms and migrate shipments)