Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix merge conflict

Luke Pulverenti 9 years ago
parent
dd0888d680
commit
25ff78a8a3
1 changed files with 0 additions and 1 deletions
Split View Show Diff Stats
  1. 0 1
      MediaBrowser.Controller/MediaBrowser.Controller.csproj

+ 0 - 1
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File 

@@ -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" />