fix: merge changes and fix conflicts

2021-06-29 10:06:57 +10:00 · 2021-06-29 10:06:57 +10:00 · 3611f4655c
parent 6775e0afd7
commit 3611f4655c
1 changed files with 0 additions and 4 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@ -313,9 +313,5 @@ class VisibleMessageView : LinearLayout {
        onPress?.invoke(rawX, rawY)
        pressCallback = null
    }
-
-    fun onContentClick() {
-        messageContentView.onContentClick?.invoke()
-    }
    // endregion
 }