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/bot/dialogs/flows/events/handlers.py
+++ b/app/bot/dialogs/flows/events/handlers.py
@@ -19,7 +19,6 @@ async def on_event_selected(
    manager.dialog_data["selected_event"] = int(item_id)
    await manager.next()

-<<<<<<< HEAD

 async def change_registration(
    callback: CallbackQuery,
@@ -40,7 +39,3 @@ async def change_registration(
            await register_user_to_event(
                manager.middleware_data["session"], user.id, event_id
            )
-=======
-async def change_registration():
-    ...
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32