diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 10:56:07 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 10:56:07 -0500 |
| commit | 5963affec5b492d4859017cfd9352dfd683b3795 (patch) | |
| tree | 8f867d1464d27f3324e45858736bfdedada41875 /MediaBrowser.Server.Mono | |
| parent | ca52e8c23b806a004471da86e8d41de8f5392fc7 (diff) | |
fix merge conflict
Diffstat (limited to 'MediaBrowser.Server.Mono')
| -rw-r--r-- | MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 8b2b19c58..e9f631bf3 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -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> |