fixed merge conflicts

2025-06-12 11:32:37 +02:00
parent fd8298906a af50e0fab9
commit ecc2564c70
47 changed files with 535 additions and 669 deletions
--- a/src/routes/(angemeldet)/+page.svelte
+++ b/src/routes/(angemeldet)/+page.svelte
@@ -1,8 +1,7 @@
-<script>
-	import Panel from '$lib/components/ui/Panel.svelte';
-	import AddProcess from '$lib/icons/Add-Process.svelte';
-	import FileRect from '$lib/icons/File-rect.svelte';
-	import ListIcon from '$lib/icons/List-icon.svelte';
+<style>
+</style>
+
+<script lang="ts">

 	export let data;
 	export let outline = true;