1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-04-09 19:15:43 +02:00

Markup fixes

This commit is contained in:
Carla Schroder 2014-12-31 14:34:45 -08:00
parent 09f843727d
commit bfe31645ab

View File

@ -38,11 +38,8 @@ When selecting a local folder that already contains data, you can choose from tw
the client are synchronized to the ownCloud server.
* :guilabel:`Start a clean sync`: When selected, all files in the local folder on the
<<<<<<< HEAD
client are deleted. These files are not synchronized to the ownCloud server.
=======
client are deleted. These files are not syncrhonized to the ownCloud server.
See :doc:`navigating` to learn how to choose specific folders to sync with on
your ownCloud server.
>>>>>>> 096511f... Update and correct desktop client manual