fixing auto merge issues

2025-03-17 19:58:57 +03:00 · 2021-11-04 10:43:51 +00:00 · 2021-11-04 10:43:51 +00:00 · 145ceacf78
commit 145ceacf78
parent 9e6bd2ee9c
2 changed files with 2 additions and 2 deletions
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@ -252,4 +252,3 @@ class NotifiableEventResolver @Inject constructor(
        return null
    }
 }
-
--- a/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
@ -76,5 +76,6 @@ fun aNotifiableMessageEvent(
        roomName = "room-name",
        roomIsDirect = false,
        canBeReplaced = false,
-        isRedacted = isRedacted
+        isRedacted = isRedacted,
+        imageUri = null
 )