diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-16 23:52:51 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 17:03:34 +0100 |
| commit | 1677284a2f4414f9a4563d58bc955d6749c4cc2a (patch) | |
| tree | a25f66253ef7caec498c9767d41fab4805aca700 /chrome/browser | |
| parent | e5757d9f5d659078c7e68329c5cd2c4b39c38668 (diff) | |
| download | external_chromium-1677284a2f4414f9a4563d58bc955d6749c4cc2a.zip external_chromium-1677284a2f4414f9a4563d58bc955d6749c4cc2a.tar.gz external_chromium-1677284a2f4414f9a4563d58bc955d6749c4cc2a.tar.bz2 | |
Merge Chromium at r11.0.696.0: Fix conflict in autofill_download.h
Small edit close to local change:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.h?r1=76196&r2=76330&pathrev=77261
Change-Id: Ife93ddd73cd31a925b542c7685535b70f69c5408
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/autofill/autofill_download.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h index 866c150..e9835ec 100644 --- a/chrome/browser/autofill/autofill_download.h +++ b/chrome/browser/autofill/autofill_download.h @@ -18,15 +18,11 @@ #include "chrome/browser/autofill/form_structure.h" #include "chrome/common/net/url_fetcher.h" -<<<<<<< HEAD #ifdef ANDROID #include "android/autofill/url_fetcher_proxy.h" #endif -class AutoFillMetrics; -======= class AutofillMetrics; ->>>>>>> chromium.org at r11.0.696.0 class Profile; // Handles getting and updating Autofill heuristics. |