From 5f16d862d35feb179fd7788cf5d657c49726992c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 12 Oct 2016 15:14:26 -0400
Subject: [PATCH] fix merge conflit

---
 Emby.Drawing/ImageMagick/ImageMagickEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
index c1881895f5..9820829ae6 100644
--- a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
+++ b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
@@ -56,7 +56,8 @@ namespace Emby.Drawing.ImageMagick
                     "bmp",
                     "erf",
                     "raf",
-                    "rw2"
+                    "rw2",
+                    "nrw"
                 };
             }
         }