Merge branch 'ubrir/develop' into develop_into_MB-43443

# Conflicts:
#	navigation-viewcontroller/src/main/java/ru/touchin/roboswag/navigation_viewcontroller/fragments/ViewControllerFragment.kt
#	navigation-viewcontroller/src/main/java/ru/touchin/roboswag/navigation_viewcontroller/viewcontrollers/ViewController.kt
This commit is contained in:
Alexey Ganin 2025-03-04 14:44:05 +03:00
commit ca83178010
2 changed files with 2 additions and 2 deletions

View File

@ -77,7 +77,7 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-common-java8") {
version {
require '2.2.0'
require '2.6.2'
}
}

View File

@ -36,7 +36,7 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-common-java8") {
version {
require '2.2.0'
require '2.6.2'
}
}
}