diff options
Diffstat (limited to 'WebCore/bindings/v8')
| -rw-r--r-- | WebCore/bindings/v8/NPV8Object.h | 3 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/bindings/v8/NPV8Object.h b/WebCore/bindings/v8/NPV8Object.h index 911987a..b9b376e 100644 --- a/WebCore/bindings/v8/NPV8Object.h +++ b/WebCore/bindings/v8/NPV8Object.h @@ -30,10 +30,7 @@ #ifndef NPV8Object_h #define NPV8Object_h -<<<<<<< HEAD -======= #include "V8Index.h" ->>>>>>> webkit.org at r54127 #if PLATFORM(CHROMIUM) // FIXME: Chromium uses a different npruntime.h, which is in // the Chromium source repository under third_party/npapi/bindings. 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" |