fixed conflict
diff --git a/patches/april_2013/p04_update_role_in_pages.py b/patches/april_2013/p04_update_role_in_pages.py
new file mode 100644
index 0000000..6a4ecc6
--- /dev/null
+++ b/patches/april_2013/p04_update_role_in_pages.py
@@ -0,0 +1,11 @@
+import webnotes
+import webnotes.model
+def execute():
+ for p in ["activity", "todo", "questions", "question-view"]:
+ pbean = webnotes.bean("Page", p)
+ pbean.doclist.append({
+ "doctype": "Page Role",
+ "role": "All",
+ "parentfield": "roles"
+ })
+ pbean.save()
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 5651045..5a68cc7 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -240,4 +240,5 @@
'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')"
+ "patches.april_2013.p04_update_role_in_pages",
]
\ No newline at end of file