Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-08 10:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflit

Browse Source
This commit is contained in:
Luke Pulverenti 2016-10-12 15:14:26 -04:00
parent 6cc1f11a69
commit 5f16d862d3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
View File

@ -56,7 +56,8 @@ namespace Emby.Drawing.ImageMagick
"bmp", "bmp",
"erf", "erf",
"raf", "raf",
"rw2" "rw2",
"nrw"
}; };
} }
} }