diff options
Diffstat (limited to 'Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h')
| -rw-r--r-- | Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h | 5 |
1 files changed, 0 insertions, 5 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 { |