diff options
| author | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 21:39:12 +0000 |
|---|---|---|
| committer | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 21:39:12 +0000 |
| commit | 8938e4e53180b3892d5e853578d5333070c40cb2 (patch) | |
| tree | 4b032712ea535d7fd8a78a6fa791bfbbb3dbe617 /chrome/browser/sync/engine/process_commit_response_command.cc | |
| parent | e77cda08c5c8647ed457ccaebf2eaa58eab8fca2 (diff) | |
| download | chromium_src-8938e4e53180b3892d5e853578d5333070c40cb2.zip chromium_src-8938e4e53180b3892d5e853578d5333070c40cb2.tar.gz chromium_src-8938e4e53180b3892d5e853578d5333070c40cb2.tar.bz2 | |
Fix some minor things that were in the unique naming CL that I forgot to address.
Review URL: http://codereview.chromium.org/435026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/process_commit_response_command.cc')
| -rwxr-xr-x | chrome/browser/sync/engine/process_commit_response_command.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/process_commit_response_command.cc b/chrome/browser/sync/engine/process_commit_response_command.cc index 46fc136..ac05cfa 100755 --- a/chrome/browser/sync/engine/process_commit_response_command.cc +++ b/chrome/browser/sync/engine/process_commit_response_command.cc @@ -127,7 +127,7 @@ void ProcessCommitResponseCommand::ProcessCommitResponse( break; case CommitResponse::CONFLICT: ++conflicting_commits; - // This is important to activate conflict resolution. + // Only server CONFLICT responses will activate conflict resolution. conflict_progress->AddConflictingItemById(commit_ids[i]); break; case CommitResponse::SUCCESS: |