mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-24 01:16:15 -04:00
fixed merge conflicts
This commit is contained in:
parent
e771542961
commit
913c3c455d
3 changed files with 2 additions and 20 deletions
|
@ -44,13 +44,6 @@ var chat = (function()
|
|||
});
|
||||
});
|
||||
},
|
||||
showHistory: function()
|
||||
{
|
||||
// this is a placeholder for the showHistory function
|
||||
// load the messages from the server
|
||||
// append them to the UI using addMessage
|
||||
self.scrollDown(); // scroll down to the bottom of the chat
|
||||
},
|
||||
hide: function ()
|
||||
{
|
||||
$("#chatcounter").text("0");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue