diff options
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc index 0a8cd8b..5092184 100644 --- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc +++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc @@ -31,8 +31,7 @@ BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {} BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {} bool BuildAndProcessConflictSetsCommand::HasCustomGroupsToChange() const { - // TODO(akalin): Set to true. - return false; + return true; } std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange( |