diff options
Diffstat (limited to 'WebCore/platform/PlatformTouchPoint.h')
| -rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index 202a2d4..4a667a0 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -54,11 +54,7 @@ public: IntPoint screenPos() const { return m_screenPos; } IntPoint pos() const { return m_pos; } -<<<<<<< HEAD -private: -======= protected: ->>>>>>> webkit.org at r58033 unsigned m_id; State m_state; IntPoint m_screenPos; |