diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:16:56 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:16:56 -0800 |
| commit | 4f4c121d9b64a02fa86438066fca6fd81e66032f (patch) | |
| tree | 3c7c4210700995545467e9edf7f093f4ae8c6022 /examples | |
| parent | 72e1ab47fc393176cb99ddaeaad1098e88472417 (diff) | |
| download | slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.gz slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.bz2 slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.xz slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.zip | |
Fix merge errors and bot example.
Diffstat (limited to 'examples')
| -rwxr-xr-x | examples/muc.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/examples/muc.py b/examples/muc.py index cfb99c23..7b93da16 100755 --- a/examples/muc.py +++ b/examples/muc.py @@ -76,13 +76,8 @@ 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: |