diff options
Diffstat (limited to 'chrome/browser/sync/engine/conflict_resolver.cc')
| -rw-r--r-- | chrome/browser/sync/engine/conflict_resolver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc index 7bc9418..f81525a 100644 --- a/chrome/browser/sync/engine/conflict_resolver.cc +++ b/chrome/browser/sync/engine/conflict_resolver.cc @@ -14,7 +14,7 @@ #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/util/character_set_converters.h" -#include "chrome/browser/sync/util/event_sys-inl.h" +#include "chrome/common/deprecated/event_sys-inl.h" using std::map; using std::set; |