diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:04:33 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:04:33 -0800 |
| commit | 72e1ab47fc393176cb99ddaeaad1098e88472417 (patch) | |
| tree | 6c94fde4f91e6668ab713c5d6200f07bc110690a /examples/muc.py | |
| parent | 1e01903072927917cf5c64ceb7bb1aac3770ea5c (diff) | |
| parent | 3575084640fb5f17d70d6d691faf6fdd2f090ee7 (diff) | |
| download | slixmpp-72e1ab47fc393176cb99ddaeaad1098e88472417.tar.gz slixmpp-72e1ab47fc393176cb99ddaeaad1098e88472417.tar.bz2 slixmpp-72e1ab47fc393176cb99ddaeaad1098e88472417.tar.xz slixmpp-72e1ab47fc393176cb99ddaeaad1098e88472417.zip | |
Merge branch 'docs' into develop
Conflicts:
docs/_static/haiku.css
docs/_static/header.png
docs/conf.py
docs/getting_started/muc.rst
docs/index.rst
examples/muc.py
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: |