fix merge conflit

2016-10-12 15:14:26 -04:00 · 2016-10-12 15:14:26 -04:00 · 5f16d862d3
commit 5f16d862d3
parent 6cc1f11a69
1 changed files with 2 additions and 1 deletions
--- 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"
                };
            }
        }