Merge branch 'develop' into hughns/msc3824-oidc-aware

Author: hughns

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo050.kt

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
-=======
  * Copyright (c) 2023 The Matrix.org Foundation C.I.C.
->>>>>>> develop
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,18 +21,11 @@ import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEnti
 import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
 import org.matrix.android.sdk.internal.util.database.RealmMigrator
 
-internal class MigrateSessionTo049(realm: DynamicRealm) : RealmMigrator(realm, 49) {
+internal class MigrateSessionTo050(realm: DynamicRealm) : RealmMigrator(realm, 50) {
 
     override fun doMigrate(realm: DynamicRealm) {
         realm.schema.get("HomeServerCapabilitiesEntity")
-<<<<<<< HEAD
                 ?.addField(HomeServerCapabilitiesEntityFields.EXTERNAL_ACCOUNT_MANAGEMENT_URL, String::class.java)
-=======
-                ?.addField(HomeServerCapabilitiesEntityFields.CAN_REDACT_EVENT_WITH_RELATIONS, Boolean::class.java)
-                ?.transform { obj ->
-                    obj.set(HomeServerCapabilitiesEntityFields.CAN_REDACT_EVENT_WITH_RELATIONS, false)
-                }
->>>>>>> develop
                 ?.forceRefreshOfHomeServerCapabilities()
     }
 }