Merge pull request #6045 from nextcloud/backport/6043/stable-3.10
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Tue, 12 Sep 2023 10:01:30 +0000 (12:01 +0200)
committerGitHub <noreply@github.com>
Tue, 12 Sep 2023 10:01:30 +0000 (12:01 +0200)
commit95180b611476e415d4ecf3f9cea19bea5b5d156d
tree000397f7df0038b523ac11b9140453378381190d
parentf87fd91b0d1be2f91abf5163e8ff7e721ae97b00
parent13fccdf84b5796f77b5790bab06d3f3b00c8d4a2
Merge pull request #6045 from nextcloud/backport/6043/stable-3.10

[stable-3.10] Display correct conflict part in multiple conflicts resolution dialog.