chrome/chrome.gyp - Issue 9305001: sync: Remove the remaining conflict sets code

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: chrome/chrome.gyp

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove failing assertion. Created 8 years, 10 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: chrome/chrome.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index 73adf6a47b432ee76f6e29897b87f83e88475c7d..ec7d014dfbc871411aad1ba4deb1da6ff36c0f74 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -366,8 +366,6 @@

'browser/sync/engine/all_status.h',

'browser/sync/engine/apply_updates_command.cc',

'browser/sync/engine/apply_updates_command.h',

- 'browser/sync/engine/build_and_process_conflict_sets_command.cc',

- 'browser/sync/engine/build_and_process_conflict_sets_command.h',

'browser/sync/engine/build_commit_command.cc',

'browser/sync/engine/build_commit_command.h',

'browser/sync/engine/cleanup_disabled_types_command.cc',