commit cf72d7f13543dedd726806f670bf553dc76d36eb
author Nabin Hait <nabinhait@gmail.com> Thu Feb 22 14:47:26 2018 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Feb 22 14:47:26 2018 +0530
tree 04c09f838f4327a7f32e07e6840e25e0d8990253
parent cad22dbe3941a55894616f42627030b8bf8cc24e
parent 15bd3167a85122ec6856843c6cd3148d91bcfae6

Fixed merge conflict

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index c4e3949..bbba837 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -504,4 +504,4 @@
 erpnext.patches.v10_0.migrate_daily_work_summary_settings_to_daily_work_summary_group
 erpnext.patches.v10_0.add_default_cash_flow_mappers
 erpnext.patches.v11_0.make_quality_inspection_template
-erpnext.patches.v10_0.update_territory_and_customer_group
+erpnext.patches.v10_0.update_territory_and_customer_group
\ No newline at end of file