commit 832320dc15b2578ec2d02daf8b78a00c355485bf
author Nabin Hait <nabinhait@gmail.com> Tue Apr 09 11:43:03 2013 +0530
committer Nabin Hait <nabinhait@gmail.com> Tue Apr 09 11:43:03 2013 +0530
tree 3816696b1935d64b70d8a19c3c69825c41e08395
parent fda2ab1054456faf33453ad82f9cffba4d8cf1f4

fixed conflict

patches/patch_list.py

diff --git a/patches/patch_list.py b/patches/patch_list.py
index 5a68cc7..b827c5b 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -239,6 +239,6 @@
 	'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