perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2653 from calmh/fix2604

Browse Source 
Change default max conflicts to 10 (fixes #2604)
This commit is contained in:
Audrius Butkevicius 2016-01-03 20:13:51 +00:00
commit 5754d31d0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/syncthing/core/syncthingController.js
View File

@ -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,