testing merge conflict

src/routes/(angemeldet)/list/+page.server.ts

@@ -0,0 +1,10 @@
+import { getVorgaenge } from '$lib/server/vorgangService';
+import type { PageServerLoad } from '../../(token-based)/view/$types';
+
+export const load: PageServerLoad = async () => {
+	const vorgangList = getVorgaenge();
+
+	return {
+		vorgangList
+	};
+};