From c4e8211687c8c4581e5d43bf4dfacb5927b69d0f Mon Sep 17 00:00:00 2001 From: Jacob Neplokh Date: Sun, 19 Jul 2020 11:36:34 -0700 Subject: [PATCH] Change ownCloud reference to Nextcloud Signed-off-by: Jacob Neplokh --- doc/conflicts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.30.2