diff options
Diffstat (limited to 'WebCore/page/PositionOptions.h')
| -rw-r--r-- | WebCore/page/PositionOptions.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/page/PositionOptions.h b/WebCore/page/PositionOptions.h index b1746a8..5cb66f7 100644 --- a/WebCore/page/PositionOptions.h +++ b/WebCore/page/PositionOptions.h @@ -33,11 +33,7 @@ namespace WebCore { class PositionOptions : public RefCounted<PositionOptions> { public: -<<<<<<< HEAD:WebCore/page/PositionOptions.h - static PassRefPtr<PositionOptions> create() { return adoptRef(new PositionOptions); } -======= static PassRefPtr<PositionOptions> create() { return adoptRef(new PositionOptions()); } ->>>>>>> webkit.org at 49305:WebCore/page/PositionOptions.h bool enableHighAccuracy() const { return m_highAccuracy; } void setEnableHighAccuracy(bool enable) { m_highAccuracy = enable; } |