From 25ff78a8a3f6c5210cfe4e194ef32c3e63ed3b13 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 27 Dec 2015 16:44:50 -0500
Subject: fix merge conflict

---
 MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 -
 1 file changed, 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index a32ffdb3b..b6dc7365a 100644
--- 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" />
-- 
cgit v1.2.3