components/sync/model/conflict_resolution.cc - Issue 2401223002: [Sync] Renaming sync/api* to sync/model*.

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: components/sync/model/conflict_resolution.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)

Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 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: components/sync/model/conflict_resolution.cc

diff --git a/components/sync/api/conflict_resolution.cc b/components/sync/model/conflict_resolution.cc

similarity index 95%

rename from components/sync/api/conflict_resolution.cc

rename to components/sync/model/conflict_resolution.cc

index 83a77c8c215c64845fdf5c0aa9c9ea5ed5aeeb6a..eedeb0dc1f6ba3d58e3626e626ac184ac7657315 100644

--- a/components/sync/api/conflict_resolution.cc

+++ b/components/sync/model/conflict_resolution.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "components/sync/api/conflict_resolution.h"

+#include "components/sync/model/conflict_resolution.h"

#include <utility>

« no previous file with comments | « components/sync/model/conflict_resolution.h ('k') | components/sync/model/data_batch.h » ('j') | no next file with comments »