diff options
Diffstat (limited to 'sync/engine/conflict_resolver.cc')
| -rw-r--r-- | sync/engine/conflict_resolver.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc index 3422f18..d775c1d 100644 --- a/sync/engine/conflict_resolver.cc +++ b/sync/engine/conflict_resolver.cc @@ -15,7 +15,9 @@ #include "sync/engine/syncer_util.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/sessions/status_controller.h" -#include "sync/syncable/syncable.h" +#include "sync/syncable/directory.h" +#include "sync/syncable/mutable_entry.h" +#include "sync/syncable/write_transaction.h" #include "sync/util/cryptographer.h" using std::list; |