Fixed conflict

This commit is contained in:
Nabin Hait
2014-01-10 16:31:48 +05:30
30 changed files with 300 additions and 242 deletions

View File

@@ -264,4 +264,5 @@ patch_list = [
"execute:webnotes.delete_doc('DocType', 'Warehouse Type')",
"patches.1312.p02_update_item_details_in_item_price",
"patches.1401.p01_move_related_property_setters_to_custom_field",
"patches.1401.p01_make_buying_selling_as_check_box_in_price_list",
]