diff options
| author | Cody Robibero <cody@robibe.ro> | 2023-10-10 15:58:51 -0600 |
|---|---|---|
| committer | Cody Robibero <cody@robibe.ro> | 2023-10-10 15:59:34 -0600 |
| commit | 6bd6fb6e0a4828cc5cb16a4e48a8fba20a7d6305 (patch) | |
| tree | 208e41ce44cb66107843dd2fdb80cbe673bc1240 /MediaBrowser.Controller/Resolvers/IItemResolver.cs | |
| parent | bc88c96cbe13301ee6e5f6a2d688a4c90338281d (diff) | |
| parent | 74f61fbd79ef2e2ad4a986f5f886581b2827de07 (diff) | |
Merge branch 'master' into chromecast-config
# Conflicts:
# Emby.Server.Implementations/ApplicationHost.cs
Diffstat (limited to 'MediaBrowser.Controller/Resolvers/IItemResolver.cs')
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/IItemResolver.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Resolvers/IItemResolver.cs b/MediaBrowser.Controller/Resolvers/IItemResolver.cs index b95d00aa3c..282aa721e8 100644 --- a/MediaBrowser.Controller/Resolvers/IItemResolver.cs +++ b/MediaBrowser.Controller/Resolvers/IItemResolver.cs @@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Resolvers /// </summary> /// <param name="args">The args.</param> /// <returns>BaseItem.</returns> - BaseItem ResolvePath(ItemResolveArgs args); + BaseItem? ResolvePath(ItemResolveArgs args); } public interface IMultiItemResolver |