update merge

MediaBrowser.Server.Implementations/Devices/DeviceManager.cs

@@ -290,4 +290,4 @@ namespace MediaBrowser.Server.Implementations.Devices
             return config.GetConfiguration<DevicesOptions>("devices");
         }
     }
-}
+}

MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs

@@ -582,4 +582,4 @@ namespace MediaBrowser.Server.Implementations.Library
             public MediaSourceInfo MediaSource;
         }
     }
-}
+}

MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs

@@ -515,4 +515,4 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
             return !validCollectionTypes.Contains(collectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
         }
     }
-}
+}