From 1862db237c9b4cfb491abb49f568bdc6f0fd35f9 Mon Sep 17 00:00:00 2001
From: Anian Schleyer <98647423+anian03@users.noreply.github.com>
Date: Thu, 22 Aug 2024 18:12:06 +0200
Subject: [PATCH] Fix merge conflict

---
 .../MessagesTabView/ConversationRow/ConversationRow.swift   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ArtemisKit/Sources/Messages/Views/MessagesTabView/ConversationRow/ConversationRow.swift b/ArtemisKit/Sources/Messages/Views/MessagesTabView/ConversationRow/ConversationRow.swift
index cc29649a..49fba182 100644
--- a/ArtemisKit/Sources/Messages/Views/MessagesTabView/ConversationRow/ConversationRow.swift
+++ b/ArtemisKit/Sources/Messages/Views/MessagesTabView/ConversationRow/ConversationRow.swift
@@ -48,12 +48,6 @@ struct ConversationRow<T: BaseConversation>: View {
                     Image(systemName: "ellipsis")
                         .padding(.m)
                 }
-                Menu {
-                    contextMenuItems
-                } label: {
-                    Image(systemName: "ellipsis")
-                        .padding(.m)
-                }
             }
             .opacity((conversation.unreadMessagesCount ?? 0) > 0 ? 1 : 0.7)
             .contextMenu {