fix merge conflict

2015-12-27 14:25:37 -05:00 · 2015-12-27 14:25:37 -05:00 · 5e445b65f3
commit 5e445b65f3
parent 2b6b76775f
1 changed files with 1 additions and 0 deletions
--- 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" />