nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-02-07 18:46:53 +05:30
parent f4e2c1fad3
commit 066ceb06cd
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/patches.txt
View File

@@ -342,14 +342,9 @@ erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
erpnext.patches.v13_0.update_tax_category_for_rcm
erpnext.patches.v13_0.convert_to_website_item_in_item_card_group_template
erpnext.patches.v13_0.agriculture_deprecation_warning
<<<<<<< HEAD
erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
erpnext.patches.v13_0.hospitality_deprecation_warning
erpnext.patches.v13_0.delete_bank_reconciliation_detail
erpnext.patches.v13_0.update_sane_transfer_against
erpnext.patches.v13_0.enable_provisional_accounting
=======
erpnext.patches.v14_0.delete_agriculture_doctypes
erpnext.patches.v13_0.update_exchange_rate_settings
erpnext.patches.v13_0.update_disbursement_account
>>>>>>> c68c70f8bc (feat: Refund entry against loans)
erpnext.patches.v13_0.update_disbursement_account