sync/sync.gyp - Issue 11192071: sync: Merge apply updates and resolve conflicts

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/sync.gyp

Issue 11192071: sync: Merge apply updates and resolve conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/sync.gyp

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

index 0d32ffb428af0cc19dffa7c8377394039f8425d5..81def5ba72ff06b730ea2cd21e9e1f9277108ed8 100644

--- a/sync/sync.gyp

+++ b/sync/sync.gyp

@@ -110,8 +110,6 @@

'engine/process_commit_response_command.h',

'engine/process_updates_command.cc',

'engine/process_updates_command.h',

- 'engine/resolve_conflicts_command.cc',

- 'engine/resolve_conflicts_command.h',

'engine/store_timestamps_command.cc',

'engine/store_timestamps_command.h',

'engine/sync_engine_event.cc',