sync/internal_api/public/sessions/model_neutral_state.cc - Issue 11314008: sync: Follow-up to conflict resolution refactor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/public/sessions/model_neutral_state.cc

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sync/internal_api/public/sessions/model_neutral_state.cc

diff --git a/sync/internal_api/public/sessions/model_neutral_state.cc b/sync/internal_api/public/sessions/model_neutral_state.cc

index c789dcca10083d417018f92aab29cf2dff8ba4af..b1a17069f2b0e13626b9b56266adb71010b4f985 100644

--- a/sync/internal_api/public/sessions/model_neutral_state.cc

+++ b/sync/internal_api/public/sessions/model_neutral_state.cc

@@ -22,7 +22,6 @@ ModelNeutralState::ModelNeutralState()

last_get_key_result(UNSET),

last_download_updates_result(UNSET),

commit_result(UNSET),

- conflicts_resolved(false),

items_committed(false),

debug_info_sent(false),

num_server_changes_remaining(0) {