do not show many conflicts dialog for a single conflict

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index 6d7ceec74aa731201490651e641ba03f3f3861a0..3630bccad5814839a84d46ec48696c8e80e038dc 100644 (file)
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -749,8 +749,6 @@ void ActivityListModel::displaySingleConflictDialog(const Activity &activity)
     });
     _currentConflictDialog->open();
     ownCloudGui::raiseDialog(_currentConflictDialog);
-
-    Systray::instance()->createResolveConflictsDialog();
 }
 
 void ActivityListModel::slotTriggerAction(const int activityIndex, const int actionIndex)