alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-24 11:05:08 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti
2015-12-19 10:56:07 -05:00
parent ca52e8c23b
commit 5963affec5
8 changed files with 11 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,10 +144,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="..\ThirdParty\MediaInfo\osx\libmediainfo.dylib">
<Link>MediaInfo\osx\libmediainfo.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">
<Link>libsqlite3.0.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>