diff options
Diffstat (limited to 'WebCore/loader/FrameLoader.cpp')
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index b88485e..6422535 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" |