fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-19 23:36:16 -05:00
parent 022f380c5a
commit 0948e8e1c5

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>