| Index: chrome/browser/sync/engine/conflict_resolver.h
|
| diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
|
| index eb122103159d7cf6c05d978e10f3f6eefb734476..3ba0db13b3b5c081dc27563474ba1e7ae4b5e0a4 100644
|
| --- a/chrome/browser/sync/engine/conflict_resolver.h
|
| +++ b/chrome/browser/sync/engine/conflict_resolver.h
|
| @@ -126,4 +126,4 @@ class ConflictResolver {
|
|
|
| } // namespace browser_sync
|
|
|
| -#endif // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
|
| +#endif // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
|
|
|