fixing auto merge issues

ouchadam · ouchadam · commit 1eb544efdbc3 · 2021-11-04T10:43:51.000Z
diff --git 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
     }
 }
-
diff --git 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
 )

Original file line number	Diff line number	Diff line change
`@@ -252,4 +252,3 @@ class NotifiableEventResolver @Inject constructor(`
`252`	`252`	`return null`
`253`	`253`	`}`
`254`	`254`	`}`
`255`		`-`
Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,6 @@ fun aNotifiableMessageEvent(`
`76`	`76`	`roomName = "room-name",`
`77`	`77`	`roomIsDirect = false,`
`78`	`78`	`canBeReplaced = false,`
`79`		`- isRedacted = isRedacted`
	`79`	`+ isRedacted = isRedacted,`
	`80`	`+ imageUri = null`
`80`	`81`	`)`