diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-22 02:59:10 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-22 02:59:10 +0000 |
| commit | 33c2841d4bcf5d754750d33fdd4a32fe19d8e7d7 (patch) | |
| tree | 069a3bbcce1d1dfe8dca39f78b810f0cf18f854e /chrome/browser/sync | |
| parent | 6010261f9c5c76e2b877a3cc4c1701eacaf04413 (diff) | |
| download | chromium_src-33c2841d4bcf5d754750d33fdd4a32fe19d8e7d7.zip chromium_src-33c2841d4bcf5d754750d33fdd4a32fe19d8e7d7.tar.gz chromium_src-33c2841d4bcf5d754750d33fdd4a32fe19d8e7d7.tar.bz2 | |
build fix: missing include
Not exactly sure why this was compiling for some people before.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rwxr-xr-x | chrome/browser/sync/engine/conflict_resolver.h | 1 |
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" |