diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:21:08 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:56 +0000 |
| commit | 5277f3a59aa76c1a40995a47261b9710c284f877 (patch) | |
| tree | 4af391b09e0239b6935e6062ebbb53e51e31ad7a /WebCore/page/GeolocationPosition.h | |
| parent | e5261c62245272b7442a8c5135a2bf85202de0a4 (diff) | |
| download | external_webkit-5277f3a59aa76c1a40995a47261b9710c284f877.zip external_webkit-5277f3a59aa76c1a40995a47261b9710c284f877.tar.gz external_webkit-5277f3a59aa76c1a40995a47261b9710c284f877.tar.bz2 | |
Merge webkit.org at r54127 : Resolve Geolocation conflicts.
Keep ours for maximumAge code.
Take theirs for client-based Geolocation code.
Change-Id: I72baa0026b1cd1bec617843a992dfb6008ca774d
Diffstat (limited to 'WebCore/page/GeolocationPosition.h')
| -rw-r--r-- | WebCore/page/GeolocationPosition.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/page/GeolocationPosition.h b/WebCore/page/GeolocationPosition.h index 91bd379..9f25b11 100644 --- a/WebCore/page/GeolocationPosition.h +++ b/WebCore/page/GeolocationPosition.h @@ -29,10 +29,7 @@ #if ENABLE(CLIENT_BASED_GEOLOCATION) #include <wtf/PassRefPtr.h> -<<<<<<< HEAD -======= #include <wtf/RefCounted.h> ->>>>>>> webkit.org at r54127 #include <wtf/RefPtr.h> namespace WebCore { |