diff options
Diffstat (limited to 'chrome/browser/sync/engine/syncer.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncer.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc index 9750fac..3fe46dc 100644 --- a/chrome/browser/sync/engine/syncer.cc +++ b/chrome/browser/sync/engine/syncer.cc @@ -221,7 +221,6 @@ void Syncer::SyncShare(sessions::SyncSession* session, break; } case PROCESS_COMMIT_RESPONSE: { - session->mutable_status_controller()->reset_num_conflicting_commits(); ProcessCommitResponseCommand process_response_command; session->mutable_status_controller()-> set_last_process_commit_response_result( |