From 4f4c121d9b64a02fa86438066fca6fd81e66032f Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 18 Jan 2012 15:16:56 -0800 Subject: Fix merge errors and bot example. --- examples/muc.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'examples') 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: -- cgit v1.2.3