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

conflict fix

Browse Source
This commit is contained in:
Ameya Shenoy 2018-01-29 17:07:57 +05:30 committed by GitHub
parent 03f6b3e588
commit 471e27559f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@ -488,9 +488,6 @@ erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
erpnext.patches.v10_0.fichier_des_ecritures_comptables_for_france
erpnext.patches.v10_0.update_assessment_plan
erpnext.patches.v10_0.update_assessment_result
<<<<<<< HEAD
erpnext.patches.v10_0.added_extra_gst_custom_field
erpnext.patches.v10_0.workflow_leave_application #2018-01-24
=======
erpnext.patches.v10_0.set_default_payment_terms_based_on_company
>>>>>>> master