From: Jacob Neplokh Date: Sun, 19 Jul 2020 18:36:34 +0000 (-0700) Subject: Change ownCloud reference to Nextcloud X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~62^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4e8211687c8c4581e5d43bf4dfacb5927b69d0f;p=nextcloud-desktop.git Change ownCloud reference to Nextcloud Signed-off-by: Jacob Neplokh --- diff --git a/doc/conflicts.rst b/doc/conflicts.rst index b74be6ec1..3ab259336 100644 --- a/doc/conflicts.rst +++ b/doc/conflicts.rst @@ -7,7 +7,7 @@ Conflicts Overview -------- -The ownCloud desktop client uploads local changes and downloads remote changes. +The Nextcloud desktop client uploads local changes and downloads remote changes. When a file has changed on the local side and on the remote between synchronization runs the client will be unable to resolve the situation on its own. It will create a conflict file with the local version, download the remote version and