| Index: components/sync/model/conflict_resolution.h
|
| diff --git a/components/sync/api/conflict_resolution.h b/components/sync/model/conflict_resolution.h
|
| similarity index 88%
|
| rename from components/sync/api/conflict_resolution.h
|
| rename to components/sync/model/conflict_resolution.h
|
| index 1f6c77b5279ea90ba317540a92dd387842dcbc47..2399cc31be44c5e3b6c04700a1e9fb6a95955a75 100644
|
| --- a/components/sync/api/conflict_resolution.h
|
| +++ b/components/sync/model/conflict_resolution.h
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
|
| -#define COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
|
| +#ifndef COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_
|
| +#define COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_
|
|
|
| #include <memory>
|
|
|
| -#include "components/sync/api/entity_data.h"
|
| +#include "components/sync/model/entity_data.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -54,4 +54,4 @@ class ConflictResolution {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
|
| +#endif // COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_
|
|
|