Fixes the latest merge

This commit is contained in:
2015-10-20 18:38:50 +02:00
parent d8a5ebd526
commit 777f4fb4c2
32 changed files with 108 additions and 110 deletions

View File

@ -373,18 +373,7 @@
<Content Include="Scripts\jquery.htmlClean.min.js" />
<Content Include="Views\Blogs\ChooseMedia.aspx" />
<Content Include="images\helix-nebula-1400x1400.jpg" />
<Content Include="images\an-pierle-876094_1280.jpg" />
<Content Include="images\drummer-652345_1280.jpg" />
<Content Include="images\live-concert-388160_1280.jpg" />
<Content Include="images\musician-923526_1280.jpg" />
<Content Include="images\drummer-652345_1280.s.jpg" />
<Content Include="images\helix-nebula-1400x1400.s.jpg" />
<Content Include="images\live-concert-388160_1280.s.jpg" />
<Content Include="images\musician-923526_1280.s.jpg" />
<Content Include="images\facebook.png" />
<Content Include="images\twiter.png" />
<Content Include="images\concert.clear.jpg" />
<Content Include="images\totemprod.png" />
<Content Include="images\star-939235_1280.jpg" />
<Content Include="App_Themes\accordion.css" />
<Content Include="App_Themes\all.css" />
@ -408,22 +397,8 @@
<Content Include="App_Themes\tooltip.css" />
<Content Include="images\helix-nebula-1400x1400.xxs.jpg" />
<Content Include="images\star-939235_1280.xxs.jpg" />
<Content Include="images\p8-av4.xxs.png" />
<Content Include="images\p8-av4.xxs.jpg" />
<Content Include="images\musician-923526_1280.xxs.jpg" />
<Content Include="images\drummer-652345_1280.xxs.jpg" />
<Content Include="images\live-concert-388160_1280.xxs.jpg" />
<Content Include="Scripts\parralax.js" />
<Content Include="images\totem.jpg" />
<Content Include="images\totem-banner.png" />
<Content Include="images\totem-banner.xxs.jpg" />
<Content Include="images\totem-banner.xs.jpg" />
<Content Include="images\musician-923526_1.nb.jpg" />
<Content Include="images\musician-923526_1.nb.xs.jpg" />
<Content Include="images\musician-923526_1.nb.xxs.jpg" />
<Content Include="images\musician-923526_1.nbb.jpg" />
<Content Include="images\musician-923526_1.nbb.xs.jpg" />
<Content Include="images\musician-923526_1.nbb.xxs.jpg" />
<Content Include="Views\Blogs\Title.aspx" />
<Content Include="Views\Blogs\PostActions.ascx" />
<Content Include="Scripts\yavsc.tags.js" />