diff options
Diffstat (limited to 'WebCore/bindings/js/JSCustomPositionCallback.h')
| -rw-r--r-- | WebCore/bindings/js/JSCustomPositionCallback.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/bindings/js/JSCustomPositionCallback.h b/WebCore/bindings/js/JSCustomPositionCallback.h index dff34fe..ad5528d 100644 --- a/WebCore/bindings/js/JSCustomPositionCallback.h +++ b/WebCore/bindings/js/JSCustomPositionCallback.h @@ -42,11 +42,6 @@ public: return adoptRef(new JSCustomPositionCallback(callback, globalObject)); } -<<<<<<< HEAD:WebCore/bindings/js/JSCustomPositionCallback.h - virtual void handleEvent(Geoposition*); - -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSCustomPositionCallback.h private: JSCustomPositionCallback(JSC::JSObject* callback, JSDOMGlobalObject*); |