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
022f380c5a
commit
0948e8e1c5
1 changed files with 0 additions and 3 deletions
Split View Show Diff Stats
  1. 0 3
      MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

+ 0 - 3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File 

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