| Index: sync/engine/resolve_conflicts_command_unittest.cc
|
| diff --git a/sync/engine/resolve_conflicts_command_unittest.cc b/sync/engine/resolve_conflicts_command_unittest.cc
|
| index ac3e84f45e1e6c14fc8aa550254496bab728cb2f..e5f3c44179c1be07a6b53eae3f92a3c3e7054112 100644
|
| --- a/sync/engine/resolve_conflicts_command_unittest.cc
|
| +++ b/sync/engine/resolve_conflicts_command_unittest.cc
|
| @@ -12,7 +12,7 @@
|
| #include "sync/test/engine/syncer_command_test.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
|
|
| namespace {
|
|
|
| @@ -48,4 +48,4 @@ TEST_F(ResolveConflictsCommandTest, GetGroupsToChange) {
|
|
|
| } // namespace
|
|
|
| -} // namespace csync
|
| +} // namespace syncer
|
|
|