diff options
Diffstat (limited to 'WebCore/platform/PlatformTouchPoint.h')
| -rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index f330eb6..82c8d78 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -48,11 +48,8 @@ public: PlatformTouchPoint() {}; #elif PLATFORM(ANDROID) PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State); -<<<<<<< HEAD -======= #elif PLATFORM(BREWMP) PlatformTouchPoint(int id, const IntPoint& windowPos, State); ->>>>>>> webkit.org at r68651 #endif unsigned id() const { return m_id; } |