diff options
Diffstat (limited to 'sync/engine/conflict_resolver.cc')
| -rw-r--r-- | sync/engine/conflict_resolver.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc index 705567d..7409197 100644 --- a/sync/engine/conflict_resolver.cc +++ b/sync/engine/conflict_resolver.cc @@ -14,7 +14,6 @@ #include "sync/engine/syncer.h" #include "sync/engine/syncer_util.h" #include "sync/protocol/nigori_specifics.pb.h" -#include "sync/protocol/service_constants.h" #include "sync/sessions/status_controller.h" #include "sync/syncable/syncable.h" #include "sync/util/cryptographer.h" |