Skip to content

Commit

Permalink
chore: fix rebase issues
Browse files Browse the repository at this point in the history
  • Loading branch information
typfel committed Sep 26, 2023
1 parent 4986f0c commit 5455a6a
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ object TestEvent {
TestConversation.ID,
"2022-03-30T15:36:00.000Z",
false,
false,
"2022-03-31T16:36:00.000Zp",
isArchiving,
)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5455a6a

Please sign in to comment.