diff options
Diffstat (limited to 'WebCore/history/CachedFrame.cpp')
| -rw-r--r-- | WebCore/history/CachedFrame.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp index 3d2399f..a027b62 100644 --- a/WebCore/history/CachedFrame.cpp +++ b/WebCore/history/CachedFrame.cpp @@ -43,10 +43,7 @@ #endif #if ENABLE(TOUCH_EVENTS) -<<<<<<< HEAD -======= #include "Chrome.h" ->>>>>>> webkit.org at r54127 #include "ChromeClient.h" #include "Page.h" #endif |