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

fix: resolve conflicts

Browse Source
This commit is contained in:
Anurag Mishra
2019-04-22 14:48:15 +05:30
parent 759bb0eb62
commit 4f16d17d21
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@@ -591,8 +591,5 @@ erpnext.patches.v11_0.make_italian_localization_fields # 26-03-2019
erpnext.patches.v11_1.make_job_card_time_logs erpnext.patches.v11_1.make_job_card_time_logs
erpnext.patches.v11_1.set_variant_based_on erpnext.patches.v11_1.set_variant_based_on
erpnext.patches.v11_1.woocommerce_set_creation_user erpnext.patches.v11_1.woocommerce_set_creation_user
<<<<<<< HEAD
erpnext.patches.v11_1.set_salary_details_submitable erpnext.patches.v11_1.set_salary_details_submitable
=======
erpnext.patches.v11_1.delete_bom_browser erpnext.patches.v11_1.delete_bom_browser
>>>>>>> fix: (Patch) Removed page Bom-Browser