Merge it right this time

bzr-revno: 650
2009-11-02 17:37:41 +00:00 · 2009-11-02 17:37:41 +00:00 · e3dd7842d4
commit e3dd7842d4
parent 29119c91a4
2 changed files with 1 additions and 4 deletions
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@ -283,11 +283,8 @@ class MainDisplay(DisplayLabel):
        self.display.show()

    def onMediaFinish(self):
-<<<<<<< TREE
        log.debug(u'Finish playing media')
        self.setVisible(False)
-=======
->>>>>>> MERGE-SOURCE
        self.mediaObject.stop()
        self.mediaObject.clearQueue()
        self.mediaLoaded = False
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-1.9.0-649
+1.9.0-650