| Index: components/sync/engine_impl/conflict_util.h
|
| diff --git a/components/sync/engine_impl/conflict_util.h b/components/sync/engine_impl/conflict_util.h
|
| index 50cb16192dcd75400ff569defa1db08077800271..403a36e57403ed7d07c359f9e1ccebc9fef68084 100644
|
| --- a/components/sync/engine_impl/conflict_util.h
|
| +++ b/components/sync/engine_impl/conflict_util.h
|
| @@ -1,12 +1,12 @@
|
| // Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -//
|
| -// Utility functions that act on syncable::MutableEntry to resolve conflicts.
|
|
|
| #ifndef COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_UTIL_H_
|
| #define COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_UTIL_H_
|
|
|
| +// Utility functions that act on syncable::MutableEntry to resolve conflicts.
|
| +
|
| namespace syncer {
|
|
|
| namespace syncable {
|
|
|