diff options
Diffstat (limited to 'WebCore/dom/TouchList.h')
| -rw-r--r-- | WebCore/dom/TouchList.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/dom/TouchList.h b/WebCore/dom/TouchList.h index f5033c9..a578e4c 100644 --- a/WebCore/dom/TouchList.h +++ b/WebCore/dom/TouchList.h @@ -28,9 +28,15 @@ #if ENABLE(TOUCH_EVENTS) +<<<<<<< HEAD #include <wtf/RefCounted.h> #include <wtf/Vector.h> #include "Touch.h" +======= +#include "Touch.h" +#include <wtf/RefCounted.h> +#include <wtf/Vector.h> +>>>>>>> webkit.org at r54127 namespace WebCore { |