opensourcemirror
/
nextcloud-desktop
mirror of https://github.com/nextcloud/desktop.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Change ownCloud reference to Nextcloud 

Signed-off-by: Jacob Neplokh <me@jacobneplokh.com>
This commit is contained in:
Jacob Neplokh 2020-07-19 11:36:34 -07:00
parent 274e3491f3
commit c4e8211687
No known key found for this signature in database
GPG Key ID: E4050DE078D551BA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/conflicts.rst
View File

@ -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