From b4e50f708ae2639b1eaaacc2c25e1825f572fc2c Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 18:26:06 +0000 Subject: [PATCH] Merge webkit.org at r54127 : Fix conflict in FrameLoader.cpp due to Android ARCHIVE See http://trac.webkit.org/changeset/52314 Change-Id: Ic6d1b8164ebe646450d5866882e1b692e3076060 --- WebCore/loader/FrameLoader.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index b88485e80..642253500 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -37,11 +37,8 @@ #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size #include "Archive.h" #include "ArchiveFactory.h" -<<<<<<< HEAD #endif -======= #include "BackForwardList.h" ->>>>>>> webkit.org at r54127 #include "CString.h" #include "Cache.h" #include "CachedPage.h" -- 2.11.0