fix after merge

2025-11-14 14:14:15 +03:00
parent 343dc8fb5f
commit 1be3401d09
4 changed files with 0 additions and 18 deletions
--- a/app/infrastructure/database/crud.py
+++ b/app/infrastructure/database/crud.py
@@ -104,7 +104,6 @@ async def update_event(
        event.end_date = end_date
    await session.commit()
    return event
-<<<<<<< HEAD


 async def register_user_to_event(session: AsyncSession, user_id: int, event_id: int):
@@ -134,5 +133,3 @@ async def unregister_user_to_event(session: AsyncSession, user_id: int, event_id
    ).scalar_one()
    user_event.status = UserEventStatus.CANCELLED.value
    await session.commit()
-=======
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32