From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 27 Jan 2021 08:10:32 +0000 (+0100)
Subject: Merge pull request #2867 from nextcloud/fix_file_resolve_dialog
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~394
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c7d9e11d89b537865a0ab674946e41d81b2fb928;p=nextcloud-desktop.git

Merge pull request #2867 from nextcloud/fix_file_resolve_dialog

Start file conflict resolve dialog asynchronous
---

c7d9e11d89b537865a0ab674946e41d81b2fb928