fixed conflict

This commit is contained in:
Nabin Hait
2013-04-29 14:37:38 +05:30
5 changed files with 57 additions and 28 deletions

View File

@@ -247,5 +247,6 @@ patch_list = [
"execute:webnotes.reload_doc('Stock', 'DocType', 'Delivery Note Item')",
"patches.april_2013.p06_default_cost_center",
"execute:webnotes.reset_perms('File Data')",
"patches.april_2013.p07_update_file_data_custom_field",
"patches.april_2013.rebuild_sales_browser",
]