diff options
Diffstat (limited to 'WebCore/html/HTMLInputElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLInputElement.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp index 5689e73..5050237 100644 --- a/WebCore/html/HTMLInputElement.cpp +++ b/WebCore/html/HTMLInputElement.cpp @@ -60,13 +60,10 @@ #include "RenderTextControlSingleLine.h" #include "RenderTheme.h" #include "TextEvent.h" -<<<<<<< HEAD:WebCore/html/HTMLInputElement.cpp #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS #include "WebViewCore.h" #endif -======= #include <wtf/MathExtras.h> ->>>>>>> webkit.org at 49305:WebCore/html/HTMLInputElement.cpp #include <wtf/StdLibExtras.h> using namespace std; |