diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-02-17 13:05:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 13:05:12 -0500 |
| commit | 9a38e4dc8abdd25f0f3674a398748f7a7e4b092a (patch) | |
| tree | 872afa2535e8318c0af9d4eca7e457d7d5b0e078 /MediaBrowser.Controller/Net/StaticResultOptions.cs | |
| parent | 25c2267a89af5c2e82774c638cdad0defcc894b5 (diff) | |
| parent | a35ea49c996d42c2fa26f0536b1beaab15bd3b08 (diff) | |
Merge pull request #925 from Bond-009/newmaser
Merge 10.2.0 release branch back into master
Diffstat (limited to 'MediaBrowser.Controller/Net/StaticResultOptions.cs')
| -rw-r--r-- | MediaBrowser.Controller/Net/StaticResultOptions.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Net/StaticResultOptions.cs b/MediaBrowser.Controller/Net/StaticResultOptions.cs index a54de12be..7a179913a 100644 --- a/MediaBrowser.Controller/Net/StaticResultOptions.cs +++ b/MediaBrowser.Controller/Net/StaticResultOptions.cs @@ -12,8 +12,6 @@ namespace MediaBrowser.Controller.Net public string ContentType { get; set; } public TimeSpan? CacheDuration { get; set; } public DateTime? DateLastModified { get; set; } - public Guid CacheKey { get; set; } - public Func<Task<Stream>> ContentFactory { get; set; } public bool IsHeadRequest { get; set; } |