fix merge conflicts

yamilmedina · yamilmedina · commit d3075b93d49d · 2025-12-22T14:59:32.000+01:00
diff --git a/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt b/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt
@@ -63,7 +63,7 @@ class KaliumConfigsModule {
             limitTeamMembersFetchDuringSlowSync = BuildConfig.LIMIT_TEAM_MEMBERS_FETCH_DURING_SLOW_SYNC,
             isMlsResetEnabled = BuildConfig.IS_MLS_RESET_ENABLED,
             collaboraIntegration = BuildConfig.COLLABORA_INTEGRATION_ENABLED,
-            dbInvalidationControlEnabled = BuildConfig.DB_INVALIDATION_CONTROL_ENABLED
+            dbInvalidationControlEnabled = BuildConfig.DB_INVALIDATION_CONTROL_ENABLED,
             domainWithFaultyKeysMap = BuildConfig.DOMAIN_REMOVAL_KEYS_FOR_REPAIR
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class KaliumConfigsModule {`
`63`	`63`	`limitTeamMembersFetchDuringSlowSync = BuildConfig.LIMIT_TEAM_MEMBERS_FETCH_DURING_SLOW_SYNC,`
`64`	`64`	`isMlsResetEnabled = BuildConfig.IS_MLS_RESET_ENABLED,`
`65`	`65`	`collaboraIntegration = BuildConfig.COLLABORA_INTEGRATION_ENABLED,`
`66`		`- dbInvalidationControlEnabled = BuildConfig.DB_INVALIDATION_CONTROL_ENABLED`
	`66`	`+ dbInvalidationControlEnabled = BuildConfig.DB_INVALIDATION_CONTROL_ENABLED,`
`67`	`67`	`domainWithFaultyKeysMap = BuildConfig.DOMAIN_REMOVAL_KEYS_FOR_REPAIR`
`68`	`68`	`)`
`69`	`69`	`}`