From 3611f4655cdd0547b4967cfcb802d3b2669aae5f Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Tue, 29 Jun 2021 10:06:57 +1000
Subject: [PATCH] fix: merge changes and fix conflicts

---
 .../securesms/conversation/v2/messages/VisibleMessageView.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git 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
index 049796764e..88e4ee9ced 100644
--- 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
 }