diff options
Diffstat (limited to 'Source/WebCore/page/EventHandler.cpp')
| -rw-r--r-- | Source/WebCore/page/EventHandler.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index f05e8b2..de59083 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -98,13 +98,12 @@ #include "TouchEvent.h" #endif -<<<<<<< HEAD -#if defined(ANDROID_PLUGINS) -#include "WebViewCore.h" -======= #if ENABLE(GESTURE_RECOGNIZER) #include "PlatformGestureRecognizer.h" ->>>>>>> webkit.org at r82507 +#endif + +#if defined(ANDROID_PLUGINS) +#include "WebViewCore.h" #endif namespace WebCore { |