Explorar o código

fix merge conflict

Luke Pulverenti %!s(int64=9) %!d(string=hai) anos
pai
achega
25ff78a8a3
Modificáronse 1 ficheiros con 0 adicións e 1 borrados
  1. 0 1
      MediaBrowser.Controller/MediaBrowser.Controller.csproj

+ 0 - 1
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" />