From: Camila <hello@camila.codes>
Date: Tue, 15 Dec 2020 09:48:43 +0000 (+0100)
Subject: Merge pull request #2714 from nextcloud/ensure_sync_after_conflict_resolution
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~469
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c50b1cc37cb4de749ae81d343fbfc822fe78f36a;p=nextcloud-desktop.git

Merge pull request #2714 from nextcloud/ensure_sync_after_conflict_resolution

Ensure a sync happens after a conflict resolution
---

c50b1cc37cb4de749ae81d343fbfc822fe78f36a