fix merge conflict

9 years ago · 25ff78a8a3
parent dd0888d680
commit 25ff78a8a3
1 changed files with 0 additions and 1 deletions
--- 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" />