diff options
Diffstat (limited to 'chrome/browser/autofill/autofill_download.h')
| -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. |