diff options
Diffstat (limited to 'WebCore/dom/TouchEvent.idl')
| -rw-r--r-- | WebCore/dom/TouchEvent.idl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/dom/TouchEvent.idl b/WebCore/dom/TouchEvent.idl index 010c36f..b46d68f 100644 --- a/WebCore/dom/TouchEvent.idl +++ b/WebCore/dom/TouchEvent.idl @@ -26,8 +26,12 @@ module events { interface [ +<<<<<<< HEAD Conditional=TOUCH_EVENTS, GenerateConstructor +======= + Conditional=TOUCH_EVENTS +>>>>>>> webkit.org at r54127 ] TouchEvent : UIEvent { readonly attribute TouchList touches; readonly attribute TouchList targetTouches; |