solve multiple conflicts from choose resolution
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Fri, 12 May 2023 13:01:28 +0000 (15:01 +0200)
committerMatthieu Gallien <matthieu_gallien@yahoo.fr>
Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200)
commit230e2de23a8456362d6525fe9e001f5a199aba76
tree0d39aa7473a4c6e53900a0fd93995c09d3a695d2
parent739c56c04a28c909a058fc30c561e28820f6c848
solve multiple conflicts from choose resolution

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
src/gui/ResolveConflictsDialog.qml
src/gui/conflictsolver.h
src/gui/syncconflictsmodel.cpp
src/gui/syncconflictsmodel.h