diff options
Diffstat (limited to 'WebCore/page/EventHandler.h')
| -rw-r--r-- | WebCore/page/EventHandler.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h index 83f2de8..f267ef5 100644 --- a/WebCore/page/EventHandler.h +++ b/WebCore/page/EventHandler.h @@ -425,10 +425,6 @@ private: IntPoint m_firstTouchScreenPos; IntPoint m_firstTouchPagePos; #endif -<<<<<<< HEAD - -======= ->>>>>>> webkit.org at r54127 }; } // namespace WebCore |