diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 23:36:16 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 23:36:16 -0500 |
| commit | 0948e8e1c50df2d0de0c123d905b291c98392a61 (patch) | |
| tree | 7a3a19979d0f482c6f9f75fd32cb39f2332c4a62 | |
| parent | 022f380c5ac6473ecae9a3c6cf561a3e68e896c1 (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 0114dd485..ef62365c6 100644 --- 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>
|