From f5450d9b4f5604ec85a542469c7e8653ada223d0 Mon Sep 17 00:00:00 2001
From: Micha <michabokelmann@web.de>
Date: Tue, 17 Jun 2025 18:38:50 +0200
Subject: [PATCH] fix: fix conflicts and changes after rebasing

---
 src/app/api-doc/react-swagger.tsx | 8 --------
 src/app/home/page.tsx             | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/app/api-doc/react-swagger.tsx b/src/app/api-doc/react-swagger.tsx
index f7d8488..0dd3931 100644
--- a/src/app/api-doc/react-swagger.tsx
+++ b/src/app/api-doc/react-swagger.tsx
@@ -4,19 +4,11 @@ import SwaggerUI from 'swagger-ui-react';
 import 'swagger-ui-react/swagger-ui.css';
 
 type Props = {
-<<<<<<< HEAD
   spec: object;
-=======
-  spec: object,
->>>>>>> 57e420f (feat(api): add swagger docs, /api/user/me GET and PUT endpoints)
 };
 
 function ReactSwagger({ spec }: Props) {
   return <SwaggerUI spec={spec} />;
 }
 
-<<<<<<< HEAD
 export default ReactSwagger;
-=======
-export default ReactSwagger;
->>>>>>> 57e420f (feat(api): add swagger docs, /api/user/me GET and PUT endpoints)
diff --git a/src/app/home/page.tsx b/src/app/home/page.tsx
index 77f3cf8..8016907 100644
--- a/src/app/home/page.tsx
+++ b/src/app/home/page.tsx
@@ -2,7 +2,7 @@
 
 import { RedirectButton } from '@/components/buttons/redirect-button';
 import { ThemePicker } from '@/components/misc/theme-picker';
-import { useGetApiUserMe } from '@/generated/api/user/user';
+import { useGetApiUserMe } from '@/generated/api/default/default';
 
 export default function Home() {
   const { data, isLoading } = useGetApiUserMe();