fix: Merge error

frappe/desk/desktop.py

@@ -378,7 +378,8 @@ def get_desk_sidebar_items(flatten=False, cache=True):
 
 		# pages sorted based on pinned to top and then by name
 		order_by = "pin_to_top desc, pin_to_bottom asc, name asc"
-		all_pages = frappe.get_all("Desk Page", fields=["name", "category", "icon",  "module"]], filters=filters, order_by=order_by, ignore_permissions=True)
+		all_pages = frappe.get_all("Desk Page", fields=["name", "category", "icon",  "module"],
+			filters=filters, order_by=order_by, ignore_permissions=True)
 		pages = []
 
 		# Filter Page based on Permission