summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xchrome/browser/sync/engine/conflict_resolver.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index a680c2a..b630025 100755
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -9,6 +9,7 @@
#define CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
#include <set>
+#include <string>
#include "base/basictypes.h"
#include "chrome/browser/sync/engine/syncer_types.h"