aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Services/ServiceController.cs
diff options
context:
space:
mode:
authorPatrick Barron <18354464+barronpm@users.noreply.github.com>2020-07-23 23:50:12 +0000
committerGitHub <noreply@github.com>2020-07-23 23:50:12 +0000
commit3d69cea1c9724210c31467bde5204c2649a23992 (patch)
treea73e7b774b0f5a7e074dedbc62ba4bf555bd3222 /Emby.Server.Implementations/Services/ServiceController.cs
parent5f67ba4d7087d7a0cad37fc9e2db212340076d12 (diff)
parent845ee21ddce8ed91d8c3c1463d0d7a06bb769635 (diff)
Merge branch 'master' into displaypreferences-efcore
Diffstat (limited to 'Emby.Server.Implementations/Services/ServiceController.cs')
-rw-r--r--Emby.Server.Implementations/Services/ServiceController.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Services/ServiceController.cs b/Emby.Server.Implementations/Services/ServiceController.cs
index 857df591a..d884d4f37 100644
--- a/Emby.Server.Implementations/Services/ServiceController.cs
+++ b/Emby.Server.Implementations/Services/ServiceController.cs
@@ -189,5 +189,4 @@ namespace Emby.Server.Implementations.Services
return ServiceExecGeneral.Execute(serviceType, req, service, requestDto, requestType.GetMethodName());
}
}
-
}