fix merge conflict

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);
             }

SharedVersion.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5802")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5806")]