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

app/bot/dialogs/flows/events/dialogs.py

@@ -4,7 +4,11 @@ from aiogram_dialog.widgets.text import Case, Const, Format, Jinja
 
 from app.bot.dialogs.templates import event_template
 
+<<<<<<< HEAD
 from .getters import event_getter, events_list_getter, registration_getter
+=======
+from .getters import event_getter, events_list_getter
+>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
 from .handlers import change_registration, on_event_selected
 from .states import EventsSG
 
@@ -31,7 +35,10 @@ events_dialog = Dialog(
                 [Const("зарегистрироваться"), Const("отменить регистрацию")],
                 selector="is_registered_to_event",
             ),
+<<<<<<< HEAD
             id="change_registration_btn",
+=======
+>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
             on_click=change_registration,
         ),
         Back(Const("Назад")),