diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-03-04 09:43:29 -0500 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-03-04 09:43:29 -0500 |
| commit | b4ca3a7ad94484fe73262a4de92c554e768ee891 (patch) | |
| tree | 21751cc3170fd1e9fd0974df059411ef4696a732 /MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | |
| parent | 67b20fdf0f970041480b1ea7d08d80b72a394c51 (diff) | |
| parent | d3b9afef2f3895daf91056938a92d6f51c8c834b (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.Controller/Providers/FanartBaseProvider.cs
MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
Diffstat (limited to 'MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj')
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 00b68e2546..4ca2c6f96b 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -248,10 +248,6 @@ <Project>{4fd51ac5-2c16-4308-a993-c3a84f3b4582}</Project> <Name>MediaBrowser.Api</Name> </ProjectReference> - <ProjectReference Include="..\MediaBrowser.ClickOnce\MediaBrowser.ClickOnce.csproj"> - <Project>{cc96bf3e-0bda-4809-bc4b-bb6d418f4a84}</Project> - <Name>MediaBrowser.ClickOnce</Name> - </ProjectReference> <ProjectReference Include="..\MediaBrowser.Common.Implementations\MediaBrowser.Common.Implementations.csproj"> <Project>{c4d2573a-3fd3-441f-81af-174ac4cd4e1d}</Project> <Name>MediaBrowser.Common.Implementations</Name> |