Fix merge errors and bot example.

2012-01-18 15:16:56 -08:00
parent 72e1ab47fc
commit 4f4c121d9b
2 changed files with 21 additions and 15 deletions
--- 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: