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.MediaEncoding/MediaBrowser.MediaEncoding.csproj | |
| parent | ca52e8c23b806a004471da86e8d41de8f5392fc7 (diff) | |
fix merge conflict
Diffstat (limited to 'MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj')
| -rw-r--r-- | MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj index 1f74994e5..df5ab4651 100644 --- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj +++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj @@ -99,10 +99,6 @@ <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project> <Name>MediaBrowser.Controller</Name> </ProjectReference> - <ProjectReference Include="..\MediaBrowser.MediaInfo\MediaBrowser.MediaInfo.csproj"> - <Project>{6e4145e4-c6d4-4e4d-94f2-87188db6e239}</Project> - <Name>MediaBrowser.MediaInfo</Name> - </ProjectReference> <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj"> <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project> <Name>MediaBrowser.Model</Name> |