diff options
Diffstat (limited to 'WebCore/bindings/v8/DOMObjectsInclude.h')
| -rw-r--r-- | WebCore/bindings/v8/DOMObjectsInclude.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h index 682ce79..275d56d 100644 --- a/WebCore/bindings/v8/DOMObjectsInclude.h +++ b/WebCore/bindings/v8/DOMObjectsInclude.h @@ -234,15 +234,14 @@ #include "V8SVGPODTypeWrapper.h" #endif // SVG -<<<<<<< HEAD:WebCore/bindings/v8/DOMObjectsInclude.h #if ENABLE(TOUCH_EVENTS) #include "Touch.h" #include "TouchList.h" #include "TouchEvent.h" -======= +#endif + #if ENABLE(WEB_SOCKETS) #include "WebSocket.h" ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/DOMObjectsInclude.h #endif #if ENABLE(WORKERS) |