diff options
| author | Carla Schroder <carla@owncloud.com> | 2015-01-01 01:48:17 +0300 |
|---|---|---|
| committer | Carla Schroder <carla@owncloud.com> | 2015-01-01 01:48:17 +0300 |
| commit | 3fc755d92f990c33358177b731cd7cb12f9f6045 (patch) | |
| tree | 68b5848c02efb3b6a27ea36dd6f20b7577ab2de9 /doc | |
| parent | 0dc43e5211678643ddadcb385ca5105eb44ea53e (diff) | |
Markup fixes
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/owncloudcmd.rst | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/owncloudcmd.rst b/doc/owncloudcmd.rst index 456f6d833..c8f7c97ab 100644 --- a/doc/owncloudcmd.rst +++ b/doc/owncloudcmd.rst @@ -48,13 +48,8 @@ Other comand line switches supported by owncloudcmd include the following: Credential Handling ~~~~~~~~~~~~~~~~~~~ -<<<<<<< HEAD -By default, owncloudcmd reads the client configuration and uses the credentials -======= By default, ``owncloudcmd`` reads the client configuration and uses the -credentials ->>>>>>> 096511f... Update and correct desktop client manual -of the GUI synchronization client. If no client is configured, or if you choose +credentials of the GUI synchronization client. If no client is configured, or if you choose to use a different user to synchronize, you can specify the user password setting with the usual URL pattern. For example:: |