mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-03-17 19:58:57 +03:00
fixing auto merge issues
This commit is contained in:
parent
9e6bd2ee9c
commit
145ceacf78
2 changed files with 2 additions and 2 deletions
|
@ -252,4 +252,3 @@ class NotifiableEventResolver @Inject constructor(
|
|||
return null
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -76,5 +76,6 @@ fun aNotifiableMessageEvent(
|
|||
roomName = "room-name",
|
||||
roomIsDirect = false,
|
||||
canBeReplaced = false,
|
||||
isRedacted = isRedacted
|
||||
isRedacted = isRedacted,
|
||||
imageUri = null
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue