fix merge conflict

MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config

@@ -1,4 +0,0 @@
-<configuration>
-  <dllmap dll="MediaInfo" target="./MediaInfo/osx/libmediainfo.dylib" os="osx"/>
-  <dllmap dll="MediaInfo" target="libmediainfo.so" os="linux"/>
-</configuration>

MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj

@@ -160,9 +160,6 @@
     <None Include="ImageMagickSharp.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="MediaBrowser.MediaInfo.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
     <None Include="System.Data.SQLite.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

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>

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -332,6 +332,15 @@
     <Content Include="dashboard-ui\devices\android\android.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\themes\holiday\bg.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\themes\holiday\style.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\themes\holiday\theme.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\themes\halloween\bg.jpg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>