diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-12 15:14:26 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-12 15:14:26 -0400 |
| commit | 5f16d862d35feb179fd7788cf5d657c49726992c (patch) | |
| tree | 483d7ebe15f86e067a0e012e5b3731059eada423 /Emby.Drawing/ImageMagick/ImageMagickEncoder.cs | |
| parent | 6cc1f11a697f3fbada2218d40f3592b0fc36b4c1 (diff) | |
fix merge conflit
Diffstat (limited to 'Emby.Drawing/ImageMagick/ImageMagickEncoder.cs')
| -rw-r--r-- | Emby.Drawing/ImageMagick/ImageMagickEncoder.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs b/Emby.Drawing/ImageMagick/ImageMagickEncoder.cs index c1881895f..9820829ae 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" }; } } |