diff options
Diffstat (limited to 'Source/WebCore/platform/android/TemporaryLinkStubs.cpp')
| -rw-r--r-- | Source/WebCore/platform/android/TemporaryLinkStubs.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp index cf15462..a046775 100644 --- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -298,16 +298,6 @@ void* WebCore::Frame::dragImageForSelection() return 0; } -<<<<<<< HEAD -======= - -WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&) -{ - ASSERT(isMainThread()); - return WTF::String(); -} - ->>>>>>> webkit.org at r78450 void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {} namespace WebCore { |