aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Channels
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-10-04 14:52:50 -0400
committerGitHub <noreply@github.com>2017-10-04 14:52:50 -0400
commit185fa7f5e76a9971e34c35783698d37902ed14cb (patch)
treea840cff09050c5c76645596bfd99bb5dfd5ad4a0 /MediaBrowser.Controller/Channels
parentc67f03ee97019aff0af41e8c6f4f8525ef90b5e5 (diff)
parent1caae368d5f75d96dada65cd2175831982363c21 (diff)
Merge pull request #2941 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Channels')
-rw-r--r--MediaBrowser.Controller/Channels/IChannelManager.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs
index 46e55a21ce..37fc892b36 100644
--- a/MediaBrowser.Controller/Channels/IChannelManager.cs
+++ b/MediaBrowser.Controller/Channels/IChannelManager.cs
@@ -117,14 +117,13 @@ namespace MediaBrowser.Controller.Channels
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>BaseItemDto.</returns>
- Task<Folder> GetInternalChannelFolder(CancellationToken cancellationToken);
+ Folder GetInternalChannelFolder(CancellationToken cancellationToken);
/// <summary>
/// Gets the channel folder.
/// </summary>
/// <param name="userId">The user identifier.</param>
/// <param name="cancellationToken">The cancellation token.</param>
- /// <returns>BaseItemDto.</returns>
- Task<BaseItemDto> GetChannelFolder(string userId, CancellationToken cancellationToken);
+ BaseItemDto GetChannelFolder(string userId, CancellationToken cancellationToken);
}
}