diff options
| author | Bond_009 <bond.009@outlook.com> | 2019-12-10 23:00:59 +0100 |
|---|---|---|
| committer | Bond_009 <bond.009@outlook.com> | 2019-12-10 23:00:59 +0100 |
| commit | 0bf8bfbb0cfd67b387a574148022f3c554ff5173 (patch) | |
| tree | 34f12fcce7b688fc50d377f90dbccc343e03b310 /Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs | |
| parent | c6d48f51f608601775d98fc7866eefc367bfd63b (diff) | |
| parent | 67922dff50967c02e8c0c10f43884fd4e788b012 (diff) | |
Merge branch 'master' into mediaencoding
Diffstat (limited to 'Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs index c295894d3a..a68562fc2c 100644 --- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs @@ -1,10 +1,11 @@ +#pragma warning disable CS1591 + using System; using System.IO; using System.Linq; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Playlists; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Extensions; namespace Emby.Server.Implementations.Library.Resolvers { |