diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 10:54:44 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 10:54:44 -0500 |
| commit | ca52e8c23b806a004471da86e8d41de8f5392fc7 (patch) | |
| tree | 69e6175287ff2463d4d3d90d70f3ad1e3b73b251 /MediaBrowser.ServerApplication | |
| parent | 6949e502dd7d95066279f31c539b4259ac336890 (diff) | |
fix merge conflict
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 9144c1ad9..382bb1c61 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -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> |