palexis3 commited on
Commit
4cdc9b4
1 Parent(s): 7821535

Fix main.py merge conflicts

Browse files
Files changed (1) hide show
  1. main.py +0 -6
main.py CHANGED
@@ -8,11 +8,8 @@ from fastapi.responses import RedirectResponse
8
  from app.api.routers.chat import chat_router
9
  from app.api.routers.user import user_router
10
  from app.api.routers.transaction import transaction_router
11
- <<<<<<< HEAD
12
  from app.api.routers.file_upload import file_upload_router
13
- =======
14
  from app.api.routers.income_statement import income_statement_router
15
- >>>>>>> main
16
  from app.settings import init_settings
17
  from fastapi.staticfiles import StaticFiles
18
  from alembic.config import Config
@@ -58,11 +55,8 @@ def init_app(init_db: bool = True) -> FastAPI:
58
  app.include_router(chat_router, prefix="/api/chat")
59
  app.include_router(user_router)
60
  app.include_router(transaction_router)
61
- <<<<<<< HEAD
62
  app.include_router(file_upload_router)
63
- =======
64
  app.include_router(income_statement_router)
65
- >>>>>>> main
66
 
67
  return app
68
 
 
8
  from app.api.routers.chat import chat_router
9
  from app.api.routers.user import user_router
10
  from app.api.routers.transaction import transaction_router
 
11
  from app.api.routers.file_upload import file_upload_router
 
12
  from app.api.routers.income_statement import income_statement_router
 
13
  from app.settings import init_settings
14
  from fastapi.staticfiles import StaticFiles
15
  from alembic.config import Config
 
55
  app.include_router(chat_router, prefix="/api/chat")
56
  app.include_router(user_router)
57
  app.include_router(transaction_router)
 
58
  app.include_router(file_upload_router)
 
59
  app.include_router(income_statement_router)
 
60
 
61
  return app
62