mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not show many conflicts dialog for a single conflict

Browse Source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-03 18:28:55 +02:00 committed by Matthieu Gallien
parent 72b78c9011
commit c118958d3d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/tray/activitylistmodel.cpp
View File

@ -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)