diff options
Diffstat (limited to 'WebCore/page/PositionCallback.h')
| -rw-r--r-- | WebCore/page/PositionCallback.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/page/PositionCallback.h b/WebCore/page/PositionCallback.h index 30da2c1..9f36d7a 100644 --- a/WebCore/page/PositionCallback.h +++ b/WebCore/page/PositionCallback.h @@ -36,11 +36,7 @@ namespace WebCore { class PositionCallback : public RefCounted<PositionCallback> { public: virtual ~PositionCallback() { } -<<<<<<< HEAD:WebCore/page/PositionCallback.h - virtual void handleEvent(Geoposition* position) = 0; -======= virtual void handleEvent(Geoposition*) = 0; ->>>>>>> webkit.org at 49305:WebCore/page/PositionCallback.h }; } // namespace WebCore |