From: Felix Weilbach <felix.weilbach@nextcloud.com>
Date: Fri, 5 Mar 2021 13:31:59 +0000 (+0100)
Subject: Merge pull request #2948 from nextcloud/bugfix/conflict-dialog-issue
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~339
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f17c52d;p=nextcloud-desktop.git

Merge pull request #2948 from nextcloud/bugfix/conflict-dialog-issue

Fix crash when opening conflict dialog
---

f17c52dccd0f7e0cce6c6062cf11a5ad03ac2b8d