Index: components/sync/api/conflict_resolution.cc |
diff --git a/components/sync/api/conflict_resolution.cc b/components/sync/api/conflict_resolution.cc |
index 7486f7aa0065b7f59c7bae3819656df569c4942f..d1d317edfca42f278dff4577097e77d45275d8c3 100644 |
--- a/components/sync/api/conflict_resolution.cc |
+++ b/components/sync/api/conflict_resolution.cc |
@@ -4,7 +4,7 @@ |
#include "components/sync/api/conflict_resolution.h" |
-namespace syncer { |
+namespace syncer_v2 { |
// static |
ConflictResolution ConflictResolution::UseLocal() { |
@@ -38,4 +38,4 @@ ConflictResolution::ConflictResolution(Type type, |
std::unique_ptr<EntityData> data) |
: type_(type), data_(std::move(data)) {} |
-} // namespace syncer |
+} // namespace syncer_v2 |