From e3dd7842d47933ee935c3d6ab1172467012b8bae Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 2 Nov 2009 17:37:41 +0000
Subject: [PATCH] Merge it right this time

bzr-revno: 650
---
 openlp/core/ui/maindisplay.py | 3 ---
 version.txt                   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index e26166ab7..c979203b4 100644
--- 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
diff --git a/version.txt b/version.txt
index 72edfdf0f..9cbffbce3 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.9.0-649
+1.9.0-650