diff options
Diffstat (limited to 'sync/engine/resolve_conflicts_command.cc')
| -rw-r--r-- | sync/engine/resolve_conflicts_command.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/resolve_conflicts_command.cc b/sync/engine/resolve_conflicts_command.cc index bac365f..edef3ff 100644 --- a/sync/engine/resolve_conflicts_command.cc +++ b/sync/engine/resolve_conflicts_command.cc @@ -10,7 +10,7 @@ #include "sync/syncable/directory.h" #include "sync/syncable/write_transaction.h" -namespace browser_sync { +namespace csync { ResolveConflictsCommand::ResolveConflictsCommand() {} ResolveConflictsCommand::~ResolveConflictsCommand() {} @@ -38,4 +38,4 @@ SyncerError ResolveConflictsCommand::ModelChangingExecuteImpl( return SYNCER_OK; } -} // namespace browser_sync +} // namespace csync |