| Index: sync/engine/update_applicator.cc
|
| diff --git a/sync/engine/update_applicator.cc b/sync/engine/update_applicator.cc
|
| index 3986e6089055c2d5933de1b6c979f4c8b0cad7f0..27569021f9c65bcce61b1f873120234d6abf4d81 100644
|
| --- a/sync/engine/update_applicator.cc
|
| +++ b/sync/engine/update_applicator.cc
|
| @@ -16,7 +16,7 @@
|
|
|
| using std::vector;
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
|
|
| UpdateApplicator::UpdateApplicator(ConflictResolver* resolver,
|
| Cryptographer* cryptographer,
|
| @@ -189,4 +189,4 @@ bool UpdateApplicator::ResultTracker::no_conflicts() const {
|
| return conflicting_ids_.empty();
|
| }
|
|
|
| -} // namespace csync
|
| +} // namespace syncer
|
|
|