merge conflict fixed
This commit is contained in:
@@ -161,7 +161,6 @@ patch_list = [
|
||||
"execute:webnotes.delete_doc('Report', 'Sales Orders Pending To Be Delivered')",
|
||||
"patches.june_2013.p05_remove_unused_doctypes",
|
||||
"patches.june_2013.p06_drop_unused_tables",
|
||||
"patches.june_2013.p08_shopping_cart_settings",
|
||||
"patches.june_2013.p09_update_global_defaults",
|
||||
"patches.june_2013.p10_lead_address",
|
||||
"patches.july_2013.p01_remove_doctype_mappers",
|
||||
|
||||
Reference in New Issue
Block a user