| Index: chrome/browser/sync/engine/conflict_resolver.cc
|
| diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc
|
| index 106ecf0cf6895669ae1ad0febcb70bfc044077ef..7914ab5e45fd0eb0062c5f6a2559610458c6edb9 100755
|
| --- a/chrome/browser/sync/engine/conflict_resolver.cc
|
| +++ b/chrome/browser/sync/engine/conflict_resolver.cc
|
| @@ -1,6 +1,6 @@
|
| // Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE entry.
|
| +// found in the LICENSE file.
|
|
|
| #include "chrome/browser/sync/engine/conflict_resolver.h"
|
|
|
|
|