| Index: sync/engine/conflict_resolver.h
|
| diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h
|
| index fedaa45804ca03521bc4bdb44a687a1d5c666e78..733348ce9a3310b03855afa4a315969344240991 100644
|
| --- a/sync/engine/conflict_resolver.h
|
| +++ b/sync/engine/conflict_resolver.h
|
| @@ -24,7 +24,7 @@ class MutableEntry;
|
| class WriteTransaction;
|
| } // namespace syncable
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
|
|
| class Cryptographer;
|
|
|
| @@ -84,6 +84,6 @@ class ConflictResolver {
|
| DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
|
| };
|
|
|
| -} // namespace csync
|
| +} // namespace syncer
|
|
|
| #endif // SYNC_ENGINE_CONFLICT_RESOLVER_H_
|
|
|