diff options
| author | Jacob Neplokh <me@jacobneplokh.com> | 2020-07-19 21:36:34 +0300 |
|---|---|---|
| committer | Jacob Neplokh <me@jacobneplokh.com> | 2020-07-19 21:36:34 +0300 |
| commit | c4e8211687c8c4581e5d43bf4dfacb5927b69d0f (patch) | |
| tree | b2744b860548141904d4aef67ae14060529a9fea /doc | |
| parent | 274e3491f3a167b21757e282ca3773e169cd790b (diff) | |
Change ownCloud reference to Nextcloud
Signed-off-by: Jacob Neplokh <me@jacobneplokh.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/conflicts.rst | 2 |
1 files changed, 1 insertions, 1 deletions
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 |