From ed3ed1f90a8bdae000d9a6c43bca6b2c84a1595e Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Sun, 3 Jan 2016 21:09:02 +0100
Subject: [PATCH] Change default max conflicts to 10 (fixes #2604)

---
 gui/syncthing/core/syncthingController.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/syncthing/core/syncthingController.js b/gui/syncthing/core/syncthingController.js
index 60731638b..67373837f 100755
--- a/gui/syncthing/core/syncthingController.js
+++ b/gui/syncthing/core/syncthingController.js
@@ -1200,7 +1200,7 @@ angular.module('syncthing.core')
             };
             $scope.currentFolder.rescanIntervalS = 60;
             $scope.currentFolder.minDiskFreePct = 1;
-            $scope.currentFolder.maxConflicts = -1;
+            $scope.currentFolder.maxConflicts = 10;
             $scope.currentFolder.order = "random";
             $scope.currentFolder.fileVersioningSelector = "none";
             $scope.currentFolder.trashcanClean = 0;
@@ -1222,7 +1222,7 @@ angular.module('syncthing.core')
                 selectedDevices: {},
                 rescanIntervalS: 60,
                 minDiskFreePct: 1,
-                maxConflicts: -1,
+                maxConflicts: 10,
                 order: "random",
                 fileVersioningSelector: "none",
                 trashcanClean: 0,