commit 35d8ce4fbda530de2622602df89f9f3946e112a3
author Saurabh <saurabh6790@gmail.com> Fri Jan 12 16:58:32 2018 +0530
committer Saurabh <saurabh6790@gmail.com> Fri Jan 12 16:58:32 2018 +0530
tree d07582997e92f50f05fc68e10c86a2dbe2a3ec03
parent e1e38a4bb91965536c6843b6f983b93dfe66675e
parent e43a3c269a924b23a93f3861b8e734a72a4d3da4

resolved merge conflicts

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 5c2c112..d99523f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -485,4 +485,6 @@
 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
\ No newline at end of file
+erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
+erpnext.patches.v10_0.update_assessment_plan
+erpnext.patches.v10_0.update_assessment_result