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:
commit
ca83178010
|
|
@ -77,7 +77,7 @@ dependencies {
|
|||
|
||||
implementation("androidx.lifecycle:lifecycle-common-java8") {
|
||||
version {
|
||||
require '2.2.0'
|
||||
require '2.6.2'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ dependencies {
|
|||
|
||||
implementation("androidx.lifecycle:lifecycle-common-java8") {
|
||||
version {
|
||||
require '2.2.0'
|
||||
require '2.6.2'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue