diff options
Diffstat (limited to 'WebCore/dom/Touch.idl')
| -rw-r--r-- | WebCore/dom/Touch.idl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/dom/Touch.idl b/WebCore/dom/Touch.idl index 29bf18d..e684d1f 100644 --- a/WebCore/dom/Touch.idl +++ b/WebCore/dom/Touch.idl @@ -26,8 +26,12 @@ module events { interface [ +<<<<<<< HEAD Conditional=TOUCH_EVENTS, GenerateConstructor +======= + Conditional=TOUCH_EVENTS +>>>>>>> webkit.org at r54127 ] Touch { readonly attribute long clientX; readonly attribute long clientY; |