fix merge conflict

9 years ago · aab0cea39a
parent f6d74d9a0e
commit aab0cea39a
2 changed files with 5 additions and 3 deletions
--- a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
+++ b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
@ -181,7 +181,9 @@ namespace Emby.Drawing.ImageMagick
        private void ScaleImage(MagickWand wand, int width, int height)
        {
-            if (_config.Configuration.EnableHighQualityImageScaling)
+            var highQuality = false;
            if (highQuality)
            {
                wand.CurrentImage.ResizeImage(width, height);
            }
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,4 @@
 using System.Reflection;
-[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5802")]
+[assembly: AssemblyVersion("3.0.5806")]