Merge pull request #2591 from nextcloud/fix_conflict_dialog_wording
authorKevin Ottens <kevin.ottens@nextcloud.com>
Mon, 26 Oct 2020 15:09:49 +0000 (16:09 +0100)
committerGitHub <noreply@github.com>
Mon, 26 Oct 2020 15:09:49 +0000 (16:09 +0100)
Remove last left over of the "remote" wording


Trivial merge