Browse files

Fix bogus function definitions due to bad merge.

  • Loading branch information...
1 parent 5e90a8e commit 27ba02654990fedd8a38e32da1e5189d49ceed6e @ajdiaz committed Apr 5, 2011
Showing with 0 additions and 4 deletions.
  1. +0 −4 whistler/bot.py
View
4 whistler/bot.py
@@ -292,8 +292,6 @@ def unregister_user(self, jid):
self.client.update_roster(jid, subscription="remove")
self.run_handler(EVENT_UNREGISTER, jid)
- def handle_muc_message(self, message):
- """Handle any received group chat message.
def handle_muc_message(self, message):
"""Handle any received group chat message.
@@ -366,8 +364,6 @@ def leave(self, rooms, resource=None):
"""
[self.leave_room(room, resource) for room in rooms]
- def join_room(self, room, resource=None):
- """Join a Multi-User Chat (MUC) room.
def join_room(self, room, resource=None):
"""Join a Multi-User Chat (MUC) room.

0 comments on commit 27ba026

Please sign in to comment.