resolved merge conflicts

This commit is contained in:
Saurabh
2018-01-12 16:58:32 +05:30
29 changed files with 632 additions and 175 deletions

View File

@@ -485,4 +485,6 @@ erpnext.patches.v10_0.enabled_regional_print_format_based_on_country
erpnext.patches.v10_0.update_asset_calculate_depreciation
erpnext.patches.v10_0.add_guardian_role_for_parent_portal
erpnext.patches.v10_0.set_numeric_ranges_in_template_if_blank
erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
erpnext.patches.v10_0.update_assessment_plan
erpnext.patches.v10_0.update_assessment_result