Skip to content

Commit

Permalink
Commit with unresolved merge conflicts outside of kalium
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] committed Nov 23, 2023
1 parent 4057b6f commit a54b457
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kalium
Submodule kalium updated 24 files
+1 −1 README.md
+1 −1 gradle/libs.versions.toml
+4 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/GlobalKaliumScope.kt
+1 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/configuration/AppLockTeamConfig.kt
+7 −7 logic/src/commonMain/kotlin/com/wire/kalium/logic/configuration/UserConfigRepository.kt
+5 −5 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/session/SessionRepository.kt
+6 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/team/TeamRepository.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+6 −32 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/applock/AppLockTeamFeatureConfigObserver.kt
+3 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/backup/BackupConstants.kt
+47 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/featureConfig/IsAppLockEditableUseCase.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/featureConfig/handler/AppLockConfigHandler.kt
+1 −1 ...src/commonMain/kotlin/com/wire/kalium/logic/feature/featureConfig/handler/ClassifiedDomainsConfigHandler.kt
+84 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/legalhold/ApproveLegalHoldUseCase.kt
+7 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/team/TeamScope.kt
+2 −2 ...in/kotlin/com/wire/kalium/logic/feature/user/screenshotCensoring/ObserveScreenshotCensoringConfigUseCase.kt
+1 −5 logic/src/commonMain/kotlin/com/wire/kalium/logic/featureFlags/KaliumConfigs.kt
+20 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/team/TeamRepositoryTest.kt
+4 −34 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/applock/AppLockTeamFeatureConfigObserverTest.kt
+165 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/legalhold/ApproveLegalHoldUseCaseTest.kt
+10 −9 ...tlin/com/wire/kalium/logic/feature/user/screeenshotCensoring/ObserveScreenshotCensoringConfigUseCaseTest.kt
+5 −0 network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/TeamsApi.kt
+11 −0 network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/TeamsApiV0.kt
+32 −0 network/src/commonTest/kotlin/com/wire/kalium/api/v0/teams/TeamsApiV0Test.kt

0 comments on commit a54b457

Please sign in to comment.