diff options
Diffstat (limited to 'examples/muc.py')
| -rwxr-xr-x | examples/muc.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/muc.py b/examples/muc.py index 8fe2eb49..cfb99c23 100755 --- a/examples/muc.py +++ b/examples/muc.py @@ -76,8 +76,13 @@ class MUCBot(sleekxmpp.ClientXMPP): event does not provide any additional data. """ +<<<<<<< HEAD self.getRoster() self.sendPresence() +======= + self.get_roster() + self.send_presence() +>>>>>>> docs self.plugin['xep_0045'].joinMUC(self.room, self.nick, # If a room password is needed, use: |