alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-08 08:48:48 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti
2015-12-19 10:54:44 -05:00
parent 6949e502dd
commit ca52e8c23b
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config
View File

@@ -1,4 +0,0 @@
<configuration>
<dllmap dll="MediaInfo" target="./MediaInfo/osx/libmediainfo.dylib" os="osx"/>
<dllmap dll="MediaInfo" target="libmediainfo.so" os="linux"/>
</configuration>

3
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

@@ -160,9 +160,6 @@
<None Include="ImageMagickSharp.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="MediaBrowser.MediaInfo.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="System.Data.SQLite.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>