mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-03-29 09:35:50 +00:00
example.cfg cleanup
This commit is contained in:
parent
6ddb666234
commit
c2949a62b5
1 changed files with 5 additions and 5 deletions
10
example.cfg
10
example.cfg
|
|
@ -28,9 +28,9 @@ b = bob_contacts_remote
|
|||
collections = ["from b"]
|
||||
|
||||
# To resolve a conflict the following values are possible:
|
||||
# `None` - abort when collisions occur (default)
|
||||
# `a wins` - assume a's items to be more up-to-date
|
||||
# `b wins` - assume b's items to be more up-to-date
|
||||
# `null` - abort when collisions occur (default)
|
||||
# `"a wins"` - assume a's items to be more up-to-date
|
||||
# `"b wins"` - assume b's items to be more up-to-date
|
||||
#conflict_resolution = null
|
||||
|
||||
[storage bob_contacts_local]
|
||||
|
|
@ -44,7 +44,8 @@ fileext = .vcf
|
|||
type = carddav
|
||||
url = https://owncloud.example.com/remote.php/carddav/
|
||||
#username =
|
||||
# The password can also be fetched from the system password storage or netrc
|
||||
# The password can also be fetched from the system password storage, netrc or a
|
||||
# custom command. See http://vdirsyncer.readthedocs.org/en/stable/keyring.html
|
||||
#password =
|
||||
|
||||
# CALDAV
|
||||
|
|
@ -61,6 +62,5 @@ fileext = .ics
|
|||
[storage bob_calendar_remote]
|
||||
type = caldav
|
||||
url = https://owncloud.example.com/remote.php/caldav/
|
||||
#auth = guess
|
||||
#username =
|
||||
#password =
|
||||
|
|
|
|||
Loading…
Reference in a new issue