fix merge conflict

9 years ago · 0948e8e1c5
parent 022f380c5a
commit 0948e8e1c5
1 changed files with 0 additions and 3 deletions
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@ -332,9 +332,6 @@
    <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>