From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 18 May 2011 13:36:51 +0100
Subject: Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
---
 Source/WebCore/loader/ResourceLoader.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Source/WebCore/loader/ResourceLoader.cpp')

diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp
index 85216fb..1dab6b2 100644
--- a/Source/WebCore/loader/ResourceLoader.cpp
+++ b/Source/WebCore/loader/ResourceLoader.cpp
@@ -145,7 +145,11 @@ 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
-- 
cgit v1.1