From aab0cea39a308fd68a2d256ab52a63c66934ed68 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 12 Jan 2016 14:30:14 -0500
Subject: [PATCH] fix merge conflict

---
 Emby.Drawing/ImageMagick/ImageMagickEncoder.cs | 4 +++-
 SharedVersion.cs                               | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
index 12a98edffa..6858c6d520 100644
--- 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);
             }
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 47d5397455..749c65f737 100644
--- a/SharedVersion.cs
+++ b/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")]