From: Camila <hello@camila.codes>
Date: Wed, 7 Jun 2023 10:09:59 +0000 (-0300)
Subject: Merge pull request #5777 from nextcloud/backport/5766/stable-3.9
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=20bd460bec184d86ef4b77c5abac1943e873ac40;p=nextcloud-desktop.git

Merge pull request #5777 from nextcloud/backport/5766/stable-3.9

[stable-3.9] Bugfix. Conflict resolution button not clickable.
---

20bd460bec184d86ef4b77c5abac1943e873ac40