commit b750b304dd68643ea847b544be34ae7da4cfd83d
author Saurabh <saurabh6790@gmail.com> Tue Nov 28 11:02:28 2017 +0530
committer Saurabh <saurabh6790@gmail.com> Tue Nov 28 11:02:28 2017 +0530
tree 3db871101521b506dbe34ed2287332fb9e5cf75d
parent a14baf4188abb34cddcee822ed4ca74fa821dcf9
parent 7b833802a91d675ddd3d2901d176f7220ea3f4d1

fixed merge-conflicts

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index b7a4099..fcf5cfc 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -470,3 +470,6 @@
 erpnext.patches.v9_0.set_shipping_type_for_existing_shipping_rules
 erpnext.patches.v9_0.update_multi_uom_fields_in_material_request
 erpnext.patches.v10_0.rename_schools_to_education
+erpnext.patches.v9_2.repost_reserved_qty_for_production
+erpnext.patches.v9_2.remove_company_from_patient
+erpnext.patches.v9_2.set_item_name_in_production_order