fixed merge conflicts

src/routes/api/list/[[vorgang]]/+server.ts

@@ -3,7 +3,7 @@ import { client } from '$lib/minio';
 /** @type {import('./$types').RequestHandler} */
 export async function GET({ params }) {
 	const prefix = params.vorgang ? `${params.vorgang}/` : '';
-	let stream = client.listObjectsV2('tatort', prefix, false, '');
+	const stream = client.listObjectsV2('tatort', prefix, false, '');
 	const result = new ReadableStream({
 		start(controller) {
 			stream.on('data', (data) => {
@@ -52,8 +52,6 @@ export async function DELETE({ params }) {
 		items_str.on('end', async () => {
 			resolve(res);
 		});
-
-		console.log(`+++ ${vorgang}`);
 	});
 
 	await client.removeObjects('tatort', object_list);

src/routes/api/tatort/+server.ts

@@ -1,12 +1,10 @@
 import { client } from '$lib/minio';
 
-/** @type {import('./$types').RequestHandler} */
 export async function GET() {
-	var stream = client.listObjectsV2('tatort', '', true);
+	const stream = client.listObjectsV2('tatort', '', true);
 	const result = new ReadableStream({
 		start(controller) {
 			stream.on('data', (data) => {
-				//console.log(data);
 				controller.enqueue(`${JSON.stringify(data)}\n`);
 			});
 			stream.on('end', () => {

src/routes/api/upload/+server.js

@@ -1,6 +0,0 @@
-import { client } from '$lib/minio';
-
-/** @type {import('./$types').RequestHandler} */
-export async function GET(params) {
-	console.log('GET', params);
-}

src/routes/api/upload/+server.ts

@@ -0,0 +1,5 @@
+import type { RequestHandler } from "@sveltejs/kit";
+
+export async function GET(params: RequestHandler) {
+	console.log('GET', params);
+}