aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.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 /Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
parent0f69ca8fa904447077fcf5319119f74702c0542a (diff)
parent100e9d586dff877610c488936aa035f61f6fedb5 (diff)
Merge from master & fix conflict
Diffstat (limited to 'Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs')
-rw-r--r--Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs b/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
index b2e957d5b..c18aa1629 100644
--- a/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
+++ b/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
@@ -10,7 +10,7 @@ namespace Jellyfin.Server.Migrations.Routines
/// </summary>
internal class DisableTranscodingThrottling : IMigrationRoutine
{
- private readonly ILogger _logger;
+ private readonly ILogger<DisableTranscodingThrottling> _logger;
private readonly IConfigurationManager _configManager;
public DisableTranscodingThrottling(ILogger<DisableTranscodingThrottling> logger, IConfigurationManager configManager)