From f28bf0238083cb1252f726db31325a54c27d8427 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Thu, 22 May 2025 09:11:25 +0200
Subject: [PATCH] merge conflict

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
index fb9265d13..8f0226e6b 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
@@ -134,7 +134,6 @@ class ConversationInfoViewModel @Inject constructor(
     val getProfileViewState: LiveData<ViewState>
         get() = _getProfileViewState
 
-    private val _markConversationAsSensitiveResult = MutableLiveData<MarkConversationAsSensitiveViewState>(MarkConversationAsSensitiveViewState.None)
     private val _markConversationAsSensitiveResult =
         MutableLiveData<MarkConversationAsSensitiveViewState>(MarkConversationAsSensitiveViewState.None)
     val markAsSensitiveResult: LiveData<MarkConversationAsSensitiveViewState>