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

@ -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");