Skip to content

Commit f28b356

Browse files
authored
fix(config): update default value of maxConflicts (#929)
In syncthing/syncthing#7131, the default value was updated from -1 to 10, so the docs should be changed accordingly.
1 parent 7269495 commit f28b356

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

users/config.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,8 @@ The following child elements may exist:
503503
.. option:: folder.maxConflicts
504504

505505
The maximum number of conflict copies to keep around for any given file.
506-
The default, ``-1``, means an unlimited number. Setting this to ``0`` disables
507-
conflict copies altogether.
506+
The default is ``10``. ``-1``, means an unlimited number.
507+
Setting this to ``0`` disables conflict copies altogether.
508508

509509
.. option:: folder.disableSparseFiles
510510

0 commit comments

Comments
 (0)