diff options
Diffstat (limited to 'WebCore/bindings/v8/V8DOMWrapper.cpp')
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index 01ae6ae..a24742d 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -32,10 +32,7 @@ #include "V8DOMWrapper.h" #include "CSSMutableStyleDeclaration.h" -<<<<<<< HEAD -======= #include "DOMDataStore.h" ->>>>>>> webkit.org at r54127 #include "DOMObjectsInclude.h" #include "DocumentLoader.h" #include "FrameLoaderClient.h" |