From e0b826c980fdd2a511a35075a2a6222eeb116117 Mon Sep 17 00:00:00 2001 From: Marcus B Spencer Date: Tue, 13 May 2025 00:40:58 -0500 Subject: [PATCH] fix(config): update default value of `maxConflicts` In syncthing/syncthing#7131, the default value was updated from -1 to 10, so the docs should be changed accordingly. --- users/config.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/config.rst b/users/config.rst index 066a0a3b..c67f1801 100644 --- a/users/config.rst +++ b/users/config.rst @@ -503,8 +503,8 @@ The following child elements may exist: .. option:: folder.maxConflicts The maximum number of conflict copies to keep around for any given file. - The default, ``-1``, means an unlimited number. Setting this to ``0`` disables - conflict copies altogether. + The default is ``10``. ``-1``, means an unlimited number. + Setting this to ``0`` disables conflict copies altogether. .. option:: folder.disableSparseFiles