diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-01 23:05:36 +0200 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-01 23:05:36 +0200 |
| commit | 5b1091db276415fbf22a420fbe6cf9e34551f75b (patch) | |
| tree | 2c871647cfea0bd8479844fd93d1dd5c2b4ffbef /MediaBrowser.Api/ChannelService.cs | |
| parent | b8580e58aadbbef6f99dfc15ab0fcc38f5210dd8 (diff) | |
| parent | cc40f84f3c138e439318e400eeb53cbb74eb8a84 (diff) | |
Merge remote-tracking branch 'upstream/master' into do-not-instantiate-services-at-startup
Diffstat (limited to 'MediaBrowser.Api/ChannelService.cs')
| -rw-r--r-- | MediaBrowser.Api/ChannelService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Api/ChannelService.cs b/MediaBrowser.Api/ChannelService.cs index 92c32f2ad..6139ba156 100644 --- a/MediaBrowser.Api/ChannelService.cs +++ b/MediaBrowser.Api/ChannelService.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using MediaBrowser.Api.UserLibrary; -using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Channels; +using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Net; |