aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/BasePluginFolder.cs
diff options
context:
space:
mode:
authorShadowghost <Ghost_of_Stone@web.de>2022-10-01 19:59:00 +0200
committerShadowghost <Ghost_of_Stone@web.de>2022-10-01 19:59:00 +0200
commit4fc52a840c5be7ce72978c3cfca2721e2edc251c (patch)
tree1d14c0d9314e805a8b06d5323b58850532e9a690 /MediaBrowser.Controller/Entities/BasePluginFolder.cs
parent59a86568d9539245dee30cf3a33ef6beb31f4bba (diff)
parent55b0ebbbf300421479d2c0dcf6be45e667a8ac9e (diff)
Merge branch 'master' into network-rewrite
Diffstat (limited to 'MediaBrowser.Controller/Entities/BasePluginFolder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/BasePluginFolder.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index 272a37df1..afafaf1c2 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
#pragma warning disable CS1591
using System.Text.Json.Serialization;
@@ -13,7 +11,7 @@ namespace MediaBrowser.Controller.Entities
public abstract class BasePluginFolder : Folder, ICollectionFolder
{
[JsonIgnore]
- public virtual string CollectionType => null;
+ public virtual string? CollectionType => null;
[JsonIgnore]
public override bool SupportsInheritedParentImages => false;