diff options
Diffstat (limited to 'Source/WebCore/page/Page.cpp')
| -rw-r--r-- | Source/WebCore/page/Page.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp index b864aa2..c4d5ca4 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -95,17 +95,10 @@ #include "GeolocationController.h" #endif -<<<<<<< HEAD -#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS) -#include "InspectorApplicationCacheAgent.h" -#endif - #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) #include "PackageNotifier.h" #endif -======= ->>>>>>> WebKit.org @ r75993 namespace WebCore { static HashSet<Page*>* allPages; |