update merge

2026-06-03 14:28:46 +01:00 · 2015-09-20 13:28:32 -04:00
parent 543cf723ef
commit 25c37e40ad
4 changed files with 19 additions and 19 deletions
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -125,7 +125,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                }
                else if (IsIgnored(child.Name))
                {
-                    
+
                }
                else
                {
@@ -515,4 +515,4 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
            return !validCollectionTypes.Contains(collectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
        }
    }
-}
+}