[minor] fixed conflict

This commit is contained in:
Nabin Hait
2013-12-04 17:26:22 +05:30
22 changed files with 7650 additions and 277 deletions

View File

@@ -257,4 +257,6 @@ patch_list = [
"execute:webnotes.delete_doc('DocType', 'Documentation Tool')",
"execute:webnotes.delete_doc('Report', 'Stock Ledger') #2013-11-29",
"patches.1312.p01_delete_old_stock_reports",
"execute:webnotes.delete_doc('Report', 'Payment Collection With Ageing')",
"execute:webnotes.delete_doc('Report', 'Payment Made With Ageing')",
]