diff options
| author | Phallacy <Dragoonmac@gmail.com> | 2019-02-20 00:46:13 -0800 |
|---|---|---|
| committer | Phallacy <Dragoonmac@gmail.com> | 2019-02-20 00:46:13 -0800 |
| commit | a0d31a49a0047a39cb2c4f7d67be64153b0a3266 (patch) | |
| tree | 8c0b3a7fb0b68bf778b92872a32949a88b891d80 /Emby.Server.Implementations/Library/Resolvers/TV | |
| parent | 6bbb968b578fe42224227b70e78825bbed5cfc6f (diff) | |
| parent | 6c6e9ca9f22d4c4bd1175d4abae846d09d2f074d (diff) | |
merging with master to clear merge conflict
Diffstat (limited to 'Emby.Server.Implementations/Library/Resolvers/TV')
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs index fed0904d19..a6d18c9b5a 100644 --- a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs @@ -3,7 +3,6 @@ using System.Linq; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.IO; namespace Emby.Server.Implementations.Library.Resolvers.TV { @@ -74,7 +73,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV return null; } - public EpisodeResolver(ILibraryManager libraryManager, IFileSystem fileSystem) : base(libraryManager, fileSystem) + public EpisodeResolver(ILibraryManager libraryManager) + : base(libraryManager) { } } |