diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 14:25:37 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 14:25:37 -0500 |
| commit | 5e445b65f31e13d47edff5ee3b8331cb9d89462f (patch) | |
| tree | b8022a2a6ec41a0ddc2a5ee5e5d97809fdbf0a28 | |
| parent | 2b6b76775fa059e6ae0265768ad79a937fa582d3 (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index b6dc7365a..a32ffdb3b 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -162,6 +162,7 @@ <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" /> |