Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts: MediaBrowser.Common.Implementations/Archiving/ZipClient.cs MediaBrowser.Model/IO/IZipClient.cs
10 years ago · 55a726cdef
parent 726cf9697a c9bf564c45
commit 55a726cdef
2 changed files with 2 additions and 2 deletions
--- a/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
+++ b/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
@ -63,7 +63,7 @@ namespace MediaBrowser.Common.Implementations.Archiving
                reader.WriteAllToDirectory(targetPath, options);
            }
        }
-        
+
        /// <summary>
        /// Extracts all from7z.
        /// </summary>
--- a/MediaBrowser.Model/IO/IZipClient.cs
+++ b/MediaBrowser.Model/IO/IZipClient.cs
@ -30,7 +30,7 @@ namespace MediaBrowser.Model.IO
        /// <param name="targetPath">The target path.</param>
        /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param>
        void ExtractAllFromZip(Stream source, string targetPath, bool overwriteExistingFiles);
-        
+
        /// <summary>
        /// Extracts all from7z.
        /// </summary>