From 832320dc15b2578ec2d02daf8b78a00c355485bf Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 9 Apr 2013 11:43:03 +0530 Subject: [PATCH] fixed conflict --- patches/patch_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index 5a68cc7df0..b827c5b482 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -239,6 +239,6 @@ patch_list = [ 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Modern") # 2013-04-02', 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-04-02', "patches.april_2013.p04_reverse_modules_list", - "execute:webnotes.delete_doc('Search Criteria', 'time_log_summary')" + "execute:webnotes.delete_doc('Search Criteria', 'time_log_summary')", "patches.april_2013.p04_update_role_in_pages", ] \ No newline at end of file