From 5455a6a12e08b28b746f314c0243cc4a45b45990 Mon Sep 17 00:00:00 2001 From: Jacob Persson <7156+typfel@users.noreply.github.com> Date: Tue, 26 Sep 2023 22:17:16 +0200 Subject: [PATCH] chore: fix rebase issues --- .../kotlin/com/wire/kalium/logic/framework/TestEvent.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt index 670a6ccb917..0a60cb77bd7 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt @@ -77,6 +77,7 @@ object TestEvent { TestConversation.ID, "2022-03-30T15:36:00.000Z", false, + false, "2022-03-31T16:36:00.000Zp", isArchiving, ) @@ -274,6 +275,7 @@ object TestEvent { id = "eventId", conversationId = TestConversation.ID, transient = true, + live = false, senderUserId = TestUser.USER_ID, timestampIso = "2022-03-30T15:36:00.000Z", typingIndicatorMode = typingIndicatorMode