Merge branch 'main' of https://git.shevkunov.space/FascioSchool/FascioSchoolBot

2025-11-14 13:49:37 +03:00
parent 93a425aea9 7e5939394d
commit 343dc8fb5f
5 changed files with 37 additions and 0 deletions
--- a/app/bot/dialogs/flows/events/handlers.py
+++ b/app/bot/dialogs/flows/events/handlers.py
@@ -19,6 +19,7 @@ async def on_event_selected(
    manager.dialog_data["selected_event"] = int(item_id)
    await manager.next()

+<<<<<<< HEAD

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