fixed conflict

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()