Fix Bad Merge Conflict

app/schema/index.py

@@ -53,7 +53,6 @@ class Transaction(TransactionResponse):
     user: User
 
 
-<<<<<<< HEAD
 class FileUploadCreate(PydanticBaseModel):
     source: str
     date: datetime
@@ -61,7 +60,8 @@ class FileUploadCreate(PydanticBaseModel):
     name_description: str
     amount: float
     type: str
-=======
+
+
 class IncomeStatementCreate(PydanticBaseModel):
     user_id: int
     date_from: datetime
@@ -74,4 +74,3 @@ class IncomeStatementResponse(PydanticBaseModel):
     date_to: datetime
     income: dict
     expenses: dict
->>>>>>> main

main.py

@@ -8,11 +8,8 @@ from fastapi.responses import RedirectResponse
 from app.api.routers.chat import chat_router
 from app.api.routers.user import user_router
 from app.api.routers.transaction import transaction_router
-<<<<<<< HEAD
 from app.api.routers.file_upload import file_upload_router
-=======
 from app.api.routers.income_statement import income_statement_router
->>>>>>> main
 from app.settings import init_settings
 from fastapi.staticfiles import StaticFiles
 from alembic.config import Config
@@ -58,11 +55,8 @@ def init_app(init_db: bool = True) -> FastAPI:
     app.include_router(chat_router, prefix="/api/chat")
     app.include_router(user_router)
     app.include_router(transaction_router)
-<<<<<<< HEAD
     app.include_router(file_upload_router)
-=======
     app.include_router(income_statement_router)
->>>>>>> main
 
     return app