diff options
Diffstat (limited to 'WebCore/html')
| -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 f0245ec..8c759cb 100644 --- a/WebCore/html/HTMLInputElement.cpp +++ b/WebCore/html/HTMLInputElement.cpp @@ -67,13 +67,10 @@ #include "StepRange.h" #include "StringHash.h" #include "TextEvent.h" -<<<<<<< HEAD #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS #include "WebViewCore.h" #endif -======= #include "WheelEvent.h" ->>>>>>> webkit.org at r65072 #include <wtf/HashMap.h> #include <wtf/MathExtras.h> #include <wtf/StdLibExtras.h> |