| Index: sync/engine/syncer.cc
|
| diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
|
| index 8d3063d0311ae70a7cb343c4df70a64280c74b79..3e8e456a019e8011a05b8b1b75a0684127edbf8b 100644
|
| --- a/sync/engine/syncer.cc
|
| +++ b/sync/engine/syncer.cc
|
| @@ -42,7 +42,7 @@ using syncable::SERVER_POSITION_IN_PARENT;
|
| using syncable::SERVER_SPECIFICS;
|
| using syncable::SERVER_VERSION;
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
|
|
| using sessions::ScopedSessionContextConflictResolver;
|
| using sessions::StatusController;
|
| @@ -296,4 +296,4 @@ void ClearServerData(syncable::MutableEntry* entry) {
|
| entry->Put(SERVER_POSITION_IN_PARENT, 0);
|
| }
|
|
|
| -} // namespace csync
|
| +} // namespace syncer
|
|
|