diff options
Diffstat (limited to 'WebCore/platform/PlatformTouchEvent.h')
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index f8d503d..84ed910 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -67,11 +67,8 @@ public: PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) PlatformTouchEvent(const Vector<IntPoint>&, TouchEventType, PlatformTouchPoint::State, int metaState); -<<<<<<< HEAD -======= #elif PLATFORM(BREWMP) PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam); ->>>>>>> webkit.org at r68651 #endif TouchEventType type() const { return m_type; } |