mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-23 21:46:03 +03:00
3f0ccf1748
locally AND in the server. The files will not be updated until the user selects which of the two files is the newest one. Note that at this time, other clients may be updating the server. So the client should take caution to select the proper new file. The server file is downloaded to disk and prepended with _ocs_conflict. so that the user can open both files and compare accordingly. A message appears notifying the user of the conflict, and the clouds turn red. They will not be reverted back to blue until all conflicts are cleared.
8 lines
249 B
Text
8 lines
249 B
Text
<RCC>
|
|
<qresource prefix="/">
|
|
<file>images/owncloud.png</file>
|
|
<file>images/owncloud_sync.png</file>
|
|
<file>images/owncloud_conflict.png</file>
|
|
<file>images/owncloud_sync_conflict.png</file>
|
|
</qresource>
|
|
</RCC>
|