| Index: sync/engine/syncer_util.h
|
| diff --git a/sync/engine/syncer_util.h b/sync/engine/syncer_util.h
|
| index e15c16da3b649f4a35f46b68c941829551f107bb..eb790ae093b95449ed095d3d389472e0eaf8fab4 100644
|
| --- a/sync/engine/syncer_util.h
|
| +++ b/sync/engine/syncer_util.h
|
| @@ -41,7 +41,6 @@ syncable::Id FindLocalIdToUpdate(
|
| UpdateAttemptResponse AttemptToUpdateEntry(
|
| syncable::WriteTransaction* const trans,
|
| syncable::MutableEntry* const entry,
|
| - ConflictResolver* resolver,
|
| Cryptographer* cryptographer);
|
|
|
| // Pass in name to avoid redundant UTF8 conversion.
|
|
|