diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 16:44:50 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 16:44:50 -0500 |
| commit | 25ff78a8a3f6c5210cfe4e194ef32c3e63ed3b13 (patch) | |
| tree | f2affd81e87507b6281d017336a8ebe022e9389f | |
| parent | dd0888d680f194a09833c891acaed4c36f1b8d85 (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index a32ffdb3b..b6dc7365a 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -162,7 +162,6 @@ <Compile Include="Entities\IHasThemeMedia.cs" /> <Compile Include="Entities\IHasTrailers.cs" /> <Compile Include="Entities\IHasUserData.cs" /> - <Compile Include="Entities\IHiddenFromDisplay.cs" /> <Compile Include="Entities\IItemByName.cs" /> <Compile Include="Entities\ILibraryItem.cs" /> <Compile Include="Entities\ImageSourceInfo.cs" /> |