diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-12 16:35:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-20 15:06:03 +0100 |
| commit | a7a33092974a68bc3adbf1073175540899a3d932 (patch) | |
| tree | df998876f18bd77929c7314d98ba802d1b950a11 /chrome | |
| parent | 22bc5ef1ef72c95f7303adefaa5949e3ed4bef1a (diff) | |
| download | external_chromium-a7a33092974a68bc3adbf1073175540899a3d932.zip external_chromium-a7a33092974a68bc3adbf1073175540899a3d932.tar.gz external_chromium-a7a33092974a68bc3adbf1073175540899a3d932.tar.bz2 | |
Merge Chromium at 10.0.621.0: Fix conflict in autofill_download.h
Upstream change close to local change.
CL:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.h?view=diff&r1=69231&r2=69232
Change-Id: I3a810578f42721fb2aa35dfbb9c737301f7ab927
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autofill/autofill_download.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h index 9220ad1..2a8724c 100644 --- a/chrome/browser/autofill/autofill_download.h +++ b/chrome/browser/autofill/autofill_download.h @@ -16,14 +16,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; ->>>>>>> chromium.org at r10.0.621.0 class Profile; // Handles getting and updating AutoFill heuristics. |