fixed conflict
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 1ee7c02..6caeb6f 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -17,6 +17,7 @@
from __future__ import unicode_literals
patch_list = [
"execute:webnotes.reload_doc('core', 'doctype', 'docfield')",
+ "execute:webnotes.reload_doc('core', 'doctype', 'docperm') # 2013-04-07",
"execute:webnotes.reload_doc('core', 'doctype', 'report')",
"execute:webnotes.reload_doc('core', 'doctype', 'doctype')",
"patches.mar_2012.so_rv_mapper_fix",
@@ -237,6 +238,10 @@
'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