diff options
Diffstat (limited to 'Source/WebCore/page/DOMWindow.cpp')
| -rw-r--r-- | Source/WebCore/page/DOMWindow.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp index c2e8c39..be6c179 100644 --- a/Source/WebCore/page/DOMWindow.cpp +++ b/Source/WebCore/page/DOMWindow.cpp @@ -1634,7 +1634,6 @@ void DOMWindow::revokeObjectURL(const String& blobURLString) } #endif -<<<<<<< HEAD:WebCore/page/DOMWindow.cpp #if ENABLE(DOM_STORAGE) && defined(ANDROID) void DOMWindow::clearDOMStorage() { @@ -1648,10 +1647,7 @@ void DOMWindow::clearDOMStorage() } #endif -void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow) -======= void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow, SetLocationLocking locking) ->>>>>>> webkit.org at r75315:Source/WebCore/page/DOMWindow.cpp { Frame* activeFrame = activeWindow->frame(); if (!activeFrame) |