aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/ResourceFileManager.cs
diff options
context:
space:
mode:
authorMax Git <rotvel@gmail.com>2020-06-15 12:12:03 +0200
committerMax Git <rotvel@gmail.com>2020-06-15 12:12:03 +0200
commit37e737e0124540e9f4a615285bd0f5c16ffbf9eb (patch)
tree69fc9707a6a8fff6e9bd4204c91fd7555633171e /Emby.Server.Implementations/ResourceFileManager.cs
parent0f69ca8fa904447077fcf5319119f74702c0542a (diff)
parent100e9d586dff877610c488936aa035f61f6fedb5 (diff)
Merge from master & fix conflict
Diffstat (limited to 'Emby.Server.Implementations/ResourceFileManager.cs')
-rw-r--r--Emby.Server.Implementations/ResourceFileManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ResourceFileManager.cs b/Emby.Server.Implementations/ResourceFileManager.cs
index d192be921..22fc62293 100644
--- a/Emby.Server.Implementations/ResourceFileManager.cs
+++ b/Emby.Server.Implementations/ResourceFileManager.cs
@@ -12,7 +12,7 @@ namespace Emby.Server.Implementations
public class ResourceFileManager : IResourceFileManager
{
private readonly IFileSystem _fileSystem;
- private readonly ILogger _logger;
+ private readonly ILogger<ResourceFileManager> _logger;
public ResourceFileManager(ILogger<ResourceFileManager> logger, IFileSystem fileSystem)
{