Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Merge Conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2021-12-26 10:23:36 +05:30 committed by GitHub
parent 98ac47caa4
commit 8e4ea7e997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/patches.txt
View File

@ -316,14 +316,7 @@ erpnext.patches.v13_0.create_ksa_vat_custom_fields
erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
erpnext.patches.v14_0.migrate_crm_settings
erpnext.patches.v13_0.rename_ksa_qr_field
<<<<<<< HEAD
erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
=======
erpnext.patches.v13_0.disable_ksa_print_format_for_others
<<<<<<< HEAD
erpnext.patches.v13_0.update_tax_category_for_rcm #1
>>>>>>> b33fd6acc7 (fix: Is Reverse Charge check in Tax Category)
=======
erpnext.patches.v13_0.update_tax_category_for_rcm
>>>>>>> 7c1bfe6b46 (chore: Remove patch comment)