alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +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: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

7
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@@ -177,13 +177,6 @@
<Link>x86\SQLite.Interop.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\ThirdParty\MediaInfo\windows\x64\MediaInfo.dll">
<Link>x64\MediaInfo.dll</Link>
</Content>
<Content Include="..\ThirdParty\MediaInfo\windows\x86\MediaInfo.dll">
<Link>x86\MediaInfo.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="x64\CORE_RL_bzlib_.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>