fixed merge conflicts

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

@@ -5,7 +5,7 @@ import caseNumberOccupied from '$lib/helper/caseNumberOccupied';
 
 /** @type {import('./$types').Actions} */
 export const actions = {
-	default: async ({ request }) => {
+	default: async ({ request }: {request: Request}) => {
 		const data = await request.formData();
 		const caseNumber = data.get('caseNumber');
 		const description = data.get('description');
@@ -28,7 +28,7 @@ export const actions = {
 
 		const config = `${JSON.stringify({ caseNumber, description, version: 1 })}\n`;
 
-		await client.putObject('tatort', `${caseNumber}/config.json`, config, {
+		await client.putObject('tatort', `${caseNumber}/config.json`, config, undefined, {
 			'Content-Type': 'application/json'
 		});
 

src/routes/(angemeldet)/tatorte/+page.svelte

@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
 	import Alert from '$lib/components/ui/Alert.svelte';
 	import Button from '$lib/components/ui/Button.svelte';
 	import Modal from '$lib/components/ui/Modal/Modal.svelte';
@@ -55,22 +55,22 @@
 					<div>
 						<label for="description" class="block text-sm font-medium leading-6 text-gray-900"
 							><span class="flex"
-								>{#if form?.error?.description}
+								>{#if form?.description}
 									<span class="inline-block mr-1"><Exclamation /></span>
 								{/if} Beschreibung</span
 							></label
 						>
 						<div class="mt-2">
 							<textarea
-								value={form?.description ?? ''}
+								value={form?.description?.toString() ?? ''}
 								id="description"
 								name="description"
 								rows="3"
 								class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
 							></textarea>
 						</div>
-						{#if form?.error?.description}
-							<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.description}</p>
+						{#if form?.error}
+							<p class="block text-sm leading-6 text-red-900 mt-2">{form.description}</p>
 						{/if}
 					</div>