summaryrefslogtreecommitdiffstats
path: root/WebCore/page/GeolocationPosition.h
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/GeolocationPosition.h')
-rw-r--r--WebCore/page/GeolocationPosition.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/page/GeolocationPosition.h b/WebCore/page/GeolocationPosition.h
index c31e9c4..91bd379 100644
--- a/WebCore/page/GeolocationPosition.h
+++ b/WebCore/page/GeolocationPosition.h
@@ -29,6 +29,10 @@
#if ENABLE(CLIENT_BASED_GEOLOCATION)
#include <wtf/PassRefPtr.h>
+<<<<<<< HEAD
+=======
+#include <wtf/RefCounted.h>
+>>>>>>> webkit.org at r54127
#include <wtf/RefPtr.h>
namespace WebCore {