fix merge issues. move user icons to the right.

This commit is contained in:
Luke Pulverenti 2013-03-30 11:04:59 -04:00
parent fd1760dac1
commit b7c3bc592f

View File

@ -102,12 +102,18 @@
<Content Include="dashboard-ui\css\images\items\list\person.png"> <Content Include="dashboard-ui\css\images\items\list\person.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\css\images\userdata\administrator.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\images\userdata\heart_off.png"> <Content Include="dashboard-ui\css\images\userdata\heart_off.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\css\images\userdata\heart_on.png"> <Content Include="dashboard-ui\css\images\userdata\heart_on.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\css\images\userdata\password.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\images\userdata\thumbs_down_off.png"> <Content Include="dashboard-ui\css\images\userdata\thumbs_down_off.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>