fix rebase

This commit is contained in:
Valere 2019-12-05 09:53:51 +01:00
parent 62f0c6edc0
commit ea817ff1c5

View file

@ -72,7 +72,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
EventType.KEY_VERIFICATION_MAC -> { EventType.KEY_VERIFICATION_MAC -> {
// These events are filtered from timeline in normal case // These events are filtered from timeline in normal case
// Only visible in developer mode // Only visible in developer mode
defaultItemFactory.create(event, highlight, readMarkerVisible, callback) defaultItemFactory.create(event, highlight, callback)
} }
// Unhandled event types (yet) // Unhandled event types (yet)