diff options
Diffstat (limited to 'WebCore/loader/DocumentLoader.h')
| -rw-r--r-- | WebCore/loader/DocumentLoader.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/loader/DocumentLoader.h b/WebCore/loader/DocumentLoader.h index 1220a0e..1fa2b65 100644 --- a/WebCore/loader/DocumentLoader.h +++ b/WebCore/loader/DocumentLoader.h @@ -43,11 +43,7 @@ namespace WebCore { class Archive; class ArchiveResource; class ArchiveResourceCollection; -<<<<<<< HEAD:WebCore/loader/DocumentLoader.h #endif - class CachedPage; -======= ->>>>>>> webkit.org at 49305:WebCore/loader/DocumentLoader.h class Frame; class FrameLoader; class MainResourceLoader; |