# Conflicts: # features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt |
||
|---|---|---|
| .. | ||
| main | ||
| test/kotlin/io/element/android/libraries/matrix/ui | ||
# Conflicts: # features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt |
||
|---|---|---|
| .. | ||
| main | ||
| test/kotlin/io/element/android/libraries/matrix/ui | ||