From: Kevin Ottens Date: Mon, 26 Oct 2020 15:09:49 +0000 (+0100) Subject: Merge pull request #2591 from nextcloud/fix_conflict_dialog_wording X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~86 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9593cea18c33ea9c67de4b08e6ee42f157a7060a;p=nextcloud-desktop.git Merge pull request #2591 from nextcloud/fix_conflict_dialog_wording Remove last left over of the "remote" wording --- 9593cea18c33ea9c67de4b08e6ee42f157a7060a