fixed git merge confict

This commit is contained in:
Iván Eixarch 2012-12-03 01:39:59 +01:00
commit 657322db91
34 changed files with 1193 additions and 254 deletions

View file

@ -113,7 +113,7 @@
background-position: -29px -22px;
right: 5px;
top: 20px;
width: 29px;
width: 30px;
}
#timeslider .star {
background-image: url(../../static/img/star.png);