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/getters.py
+++ b/app/bot/dialogs/flows/events/getters.py
@@ -5,10 +5,7 @@ from app.infrastructure.database.crud import (
    get_event_by_id,
    get_events_list,
 )
-<<<<<<< HEAD
 from app.infrastructure.database.enums import UserEventStatus
-=======
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
 from app.infrastructure.database.models import Event