aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
diff options
context:
space:
mode:
authorebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com>2012-09-20 11:28:02 -0400
committerebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com>2012-09-20 11:28:02 -0400
commite2ae376eef11dbb69c6d5d0ca31b202394452390 (patch)
treecb7c90b9bd1685aa3f8219686bf0e1c1b306bdc0 /MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
parent4e3ce41880d643a2951dc971f1e8f6e21f57829c (diff)
parentd8c01ded6eb57ba312e1cd62c4fa51dbcce6053a (diff)
Merge with default
Diffstat (limited to 'MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs')
-rw-r--r--MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
index 3ce85a688..579e341fe 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
@@ -13,11 +13,6 @@ namespace MediaBrowser.Common.Net.Handlers
protected string ResourcePath { get; set; }
- public override Task<string> GetContentType()
- {
- return Task.FromResult(MimeTypes.GetMimeType(ResourcePath));
- }
-
protected override Task WriteResponseToOutputStream(Stream stream)
{
return GetEmbeddedResourceStream().CopyToAsync(stream);