diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-15 17:34:39 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-15 17:34:39 +0100 |
| commit | 49b61f238e634e8b2ed4af8a3e0036080cd023a6 (patch) | |
| tree | a12641849c607a3ec819b87d48481f0c5c525e1c /MediaBrowser.Api/System/SystemService.cs | |
| parent | 9c4239af01fca7c22fbf2bdc9c97af182f858bf2 (diff) | |
| parent | 99acf83dfafedd3f426cf3ddf0de8bf58cdea86d (diff) | |
Merge branch 'dev' into reformat
# Conflicts:
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
# Emby.Server.Implementations/LiveTv/LiveTvManager.cs
# Emby.Server.Implementations/Security/MBLicenseFile.cs
# Emby.Server.Implementations/Security/PluginSecurityManager.cs
# Emby.Server.Implementations/Security/RegRecord.cs
# MediaBrowser.Api/PluginService.cs
# MediaBrowser.Api/System/SystemService.cs
# MediaBrowser.Common/Security/IRequiresRegistration.cs
# MediaBrowser.Common/Security/ISecurityManager.cs
# MediaBrowser.Common/Security/PaymentRequiredException.cs
# MediaBrowser.Model/Entities/MBRegistrationRecord.cs
# MediaBrowser.Model/Entities/PluginSecurityInfo.cs
# deployment/win-generic/build-jellyfin.ps1
Diffstat (limited to 'MediaBrowser.Api/System/SystemService.cs')
| -rw-r--r-- | MediaBrowser.Api/System/SystemService.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs index c45f9cae8..3492ca47b 100644 --- a/MediaBrowser.Api/System/SystemService.cs +++ b/MediaBrowser.Api/System/SystemService.cs @@ -100,8 +100,6 @@ namespace MediaBrowser.Api.System private readonly INetworkManager _network; - private readonly ISecurityManager _security; - /// <summary> /// Initializes a new instance of the <see cref="SystemService" /> class. /// </summary> @@ -109,13 +107,12 @@ namespace MediaBrowser.Api.System /// <param name="appPaths">The application paths.</param> /// <param name="fileSystem">The file system.</param> /// <exception cref="ArgumentNullException">jsonSerializer</exception> - public SystemService(IServerApplicationHost appHost, IApplicationPaths appPaths, IFileSystem fileSystem, INetworkManager network, ISecurityManager security) + public SystemService(IServerApplicationHost appHost, IApplicationPaths appPaths, IFileSystem fileSystem, INetworkManager network) { _appHost = appHost; _appPaths = appPaths; _fileSystem = fileSystem; _network = network; - _security = security; } public object Post(PingSystem request) |