From ca52e8c23b806a004471da86e8d41de8f5392fc7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Dec 2015 10:54:44 -0500
Subject: fix merge conflict

---
 .../MediaBrowser.ServerApplication.csproj                          | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 9144c1ad9f..382bb1c61e 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -177,13 +177,6 @@
       <Link>x86\SQLite.Interop.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\ThirdParty\MediaInfo\windows\x64\MediaInfo.dll">
-      <Link>x64\MediaInfo.dll</Link>
-    </Content>
-    <Content Include="..\ThirdParty\MediaInfo\windows\x86\MediaInfo.dll">
-      <Link>x86\MediaInfo.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="x64\CORE_RL_bzlib_.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3