# Conflicts: # vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt |
||
|---|---|---|
| .. | ||
| res | ||
| AndroidManifest.xml | ||
# Conflicts: # vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt |
||
|---|---|---|
| .. | ||
| res | ||
| AndroidManifest.xml | ||