fixed merge conflicts

This commit is contained in:
Peter 'Pita' Martischka 2011-08-22 13:14:59 +01:00
parent e771542961
commit 913c3c455d
3 changed files with 2 additions and 20 deletions

View file

@ -1138,14 +1138,6 @@ width:33px !important;
display:none;
}
#showhistorylabel{
position:absolute;
left:58px;
top:4px;
cursor: hand;
cursor: pointer;
}
#online_count{
color: #999;
}