mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-28 19:29:15 -04:00
fixed merge conflicts
This commit is contained in:
parent
e771542961
commit
913c3c455d
3 changed files with 2 additions and 20 deletions
|
@ -1138,14 +1138,6 @@ width:33px !important;
|
|||
display:none;
|
||||
}
|
||||
|
||||
#showhistorylabel{
|
||||
position:absolute;
|
||||
left:58px;
|
||||
top:4px;
|
||||
cursor: hand;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#online_count{
|
||||
color: #999;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue