From fdea83ef42b9ac7260eef117f40a500ab88ce37c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 8 Apr 2013 13:08:19 +0530 Subject: [PATCH] fixed conflict --- patches/patch_list.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index 6caeb6f86e..5651045327 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -238,10 +238,6 @@ patch_list = [ 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Classic") # 2013-04-02', 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Modern") # 2013-04-02', 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-04-02', -<<<<<<< HEAD "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')", ->>>>>>> master ] \ No newline at end of file