diff options
Diffstat (limited to 'Source/WebCore/Android.v8bindings.mk')
| -rw-r--r-- | Source/WebCore/Android.v8bindings.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk index 446051a..f42fc28 100644 --- a/Source/WebCore/Android.v8bindings.mk +++ b/Source/WebCore/Android.v8bindings.mk @@ -199,7 +199,6 @@ LOCAL_SRC_FILES += \ bridge/jni/v8/JavaClassV8.cpp \ bridge/jni/v8/JavaFieldV8.cpp \ bridge/jni/v8/JavaInstanceV8.cpp \ -<<<<<<< HEAD bridge/jni/v8/JavaNPObjectV8.cpp # For XPath. @@ -209,7 +208,3 @@ LOCAL_SRC_FILES += \ # For XSLT. LOCAL_SRC_FILES += \ bindings/v8/custom/V8XSLTProcessorCustom.cpp -======= - bridge/jni/v8/JavaNPObject.cpp \ - bridge/jni/v8/JobjectWrapper.cpp ->>>>>>> WebKit at r80534 |