| Index: sync/engine/resolve_conflicts_command.h
|
| diff --git a/sync/engine/resolve_conflicts_command.h b/sync/engine/resolve_conflicts_command.h
|
| index 217ddb2c772ac1f7069932e3681c71e5ef4a6bf2..22a9302a778c5d75415412bc057a21b903614dc4 100644
|
| --- a/sync/engine/resolve_conflicts_command.h
|
| +++ b/sync/engine/resolve_conflicts_command.h
|
| @@ -10,7 +10,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "sync/engine/model_changing_syncer_command.h"
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
|
|
| class ResolveConflictsCommand : public ModelChangingSyncerCommand {
|
| public:
|
| @@ -28,6 +28,6 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand {
|
| DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
|
| };
|
|
|
| -} // namespace csync
|
| +} // namespace syncer
|
|
|
| #endif // SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
|
|
|