main #8

Closed
student-18211 wants to merge 13 commits from student-18211/NTO-2025-Android-TeamTask:main into main
First-time contributor
No description provided.
student-18211 added 13 commits 2025-12-08 19:18:23 +00:00
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#1
revert Merge pull request 'Added appearance and basic booking functionality' (#1) from student-15047/NTO-2025-Android-TeamTask:to-book into main

Reviewed-on: student-18211/NTO-2025-Android-TeamTask#1
# Conflicts:
#	app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookIntent.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookState.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookViewModel.kt
#	app/src/main/res/values/strings.xml
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#4
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#5
Merge pull request 'My job and Egor's job' (#6) from student-15047/NTO-2025-Android-TeamTask:main into main
Some checks failed
Android Test / validate-and-test (pull_request) Has been cancelled
3941641d1f
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#6
student-18211 closed this pull request 2025-12-10 03:29:25 +00:00
Some checks failed
Android Test / validate-and-test (pull_request) Has been cancelled

Pull request closed

Sign in to join this conversation.
No Reviewers
No Label
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Olympic/NTO-2025-Android-TeamTask#8