diff options
Diffstat (limited to 'WebCore/dom/TouchList.h')
| -rw-r--r-- | WebCore/dom/TouchList.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/dom/TouchList.h b/WebCore/dom/TouchList.h index a578e4c..61350b0 100644 --- a/WebCore/dom/TouchList.h +++ b/WebCore/dom/TouchList.h @@ -28,15 +28,9 @@ #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 { |