diff options
Diffstat (limited to 'WebCore/bridge/jni/jni_jsobject.h')
| -rw-r--r-- | WebCore/bridge/jni/jni_jsobject.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/bridge/jni/jni_jsobject.h b/WebCore/bridge/jni/jni_jsobject.h index 3c87043..34a78ba 100644 --- a/WebCore/bridge/jni/jni_jsobject.h +++ b/WebCore/bridge/jni/jni_jsobject.h @@ -128,10 +128,6 @@ jstring KJS_JSObject_JSObjectToString(JNIEnv*, jclass, jlong nativeJSObject); #endif // PLATFORM(MAC) -<<<<<<< HEAD:WebCore/bridge/jni/jni_jsobject.h -#endif // ENABLE(MAC_JAVA_BRIDGE) -======= #endif // ENABLE(JAVA_BRIDGE) ->>>>>>> webkit.org at r58956:WebCore/bridge/jni/jni_jsobject.h #endif // JAVASCRIPTCORE_BINDINGS_JNI_JSOBJECT_H |