commit fdea83ef42b9ac7260eef117f40a500ab88ce37c
author Nabin Hait <nabinhait@gmail.com> Mon Apr 08 13:08:19 2013 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Apr 08 13:08:19 2013 +0530
tree 2b2d74a6d86779403351c6e73f6e9af114e8325d
parent 2b61f6142a061d0824c77ba49069276176e2a1db

fixed conflict

patches/patch_list.py

diff --git a/patches/patch_list.py b/patches/patch_list.py
index 6caeb6f..5651045 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -238,10 +238,6 @@
 	'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