diff options
Diffstat (limited to 'Source/WebCore/bridge/jni/jsc')
| -rw-r--r-- | Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h | 5 | ||||
| -rw-r--r-- | Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h b/Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h index 0374b45..a67264a 100644 --- a/Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h +++ b/Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h @@ -30,15 +30,10 @@ #if ENABLE(JAVA_BRIDGE) #include "BridgeJSC.h" -<<<<<<< HEAD:Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h -#include "JNIBridge.h" -#include <JavaVM/jni.h> -======= #include "JNIUtility.h" #include "JavaMethod.h" #include "JavaString.h" #include "JobjectWrapper.h" ->>>>>>> WebKit at r80534:Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h namespace JSC { diff --git a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h index 899788e..937e49c 100644 --- a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h +++ b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h @@ -29,11 +29,8 @@ #if ENABLE(JAVA_BRIDGE) #include "BridgeJSC.h" -<<<<<<< HEAD -======= #include "JNIUtility.h" #include "JobjectWrapper.h" ->>>>>>> WebKit at r80534 #include "runtime_root.h" namespace JSC { |