diff options
Diffstat (limited to 'WebCore/platform/android/TemporaryLinkStubs.cpp')
| -rw-r--r-- | WebCore/platform/android/TemporaryLinkStubs.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp index 2cacef9..bedb91b 100644 --- a/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -311,17 +311,7 @@ void* WebCore::Frame::dragImageForSelection() return 0; } -<<<<<<< HEAD -void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WebCore::String const&) {} -======= - -WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&) -{ - return WTF::String(); -} - void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {} ->>>>>>> webkit.org at r65072 namespace WebCore { |