diff options
Diffstat (limited to 'Source/WebCore/page/History.cpp')
| -rw-r--r-- | Source/WebCore/page/History.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp index abbf9ec..1d1e77a 100644 --- a/Source/WebCore/page/History.cpp +++ b/Source/WebCore/page/History.cpp @@ -85,10 +85,7 @@ void History::go(int distance) { if (!m_frame) return; -<<<<<<< HEAD:WebCore/page/History.cpp -======= ->>>>>>> webkit.org at r75315:Source/WebCore/page/History.cpp m_frame->navigationScheduler()->scheduleHistoryNavigation(distance); } |