diff options
Diffstat (limited to 'Source/WebCore/loader/ResourceLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/ResourceLoader.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp index 1dab6b2..78c86d9 100644 --- a/Source/WebCore/loader/ResourceLoader.cpp +++ b/Source/WebCore/loader/ResourceLoader.cpp @@ -145,11 +145,7 @@ void ResourceLoader::start() ASSERT(!m_request.isNull()); ASSERT(m_deferredRequest.isNull()); -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -======= #if ENABLE(WEB_ARCHIVE) ->>>>>>> webkit.org at r78450 if (m_documentLoader->scheduleArchiveLoad(this, m_request, m_request.url())) return; #endif |