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