projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f87fd91) | patch
Display correct conflict part in multiple conflicts resolution dialog.
authoralex-z <blackslayer4@gmail.com>
Mon, 11 Sep 2023 14:19:42 +0000 (16:19 +0200)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Tue, 12 Sep 2023 08:47:03 +0000 (08:47 +0000)
commit13fccdf84b5796f77b5790bab06d3f3b00c8d4a2
tree000397f7df0038b523ac11b9140453378381190dtree | snapshot
parentf87fd91b0d1be2f91abf5163e8ff7e721ae97b00commit | diff
Display correct conflict part in multiple conflicts resolution dialog.

Signed-off-by: alex-z <blackslayer4@gmail.com>
src/gui/ConflictDelegate.qml diff | blob | history
src/gui/ResolveConflictsDialog.qml diff | blob | history
src/gui/syncconflictsmodel.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.