Fix merge

This commit is contained in:
Hugh Nimmo-Smith 2022-10-17 13:41:27 +01:00
parent 7e24f6a2b0
commit d616251f26
1 changed files with 0 additions and 2 deletions

View File

@ -132,8 +132,6 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
homeServerCapabilitiesEntity.roomVersionsJson = capabilities?.roomVersions?.let { homeServerCapabilitiesEntity.roomVersionsJson = capabilities?.roomVersions?.let {
MoshiProvider.providesMoshi().adapter(RoomVersions::class.java).toJson(it) MoshiProvider.providesMoshi().adapter(RoomVersions::class.java).toJson(it)
} }
homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
getVersionResult?.doesServerSupportThreads().orFalse()
} }
if (getMediaConfigResult != null) { if (getMediaConfigResult != null) {