From 14dbfaa4b50034fb5b874032a85534a5bee671f1 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 28 Aug 2010 19:10:14 +0200
Subject: [PATCH] fixed stuff messed up resolvesing the conflict

---
 openlp/plugins/bibles/lib/mediaitem.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 7cf45c238..7f518af71 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -518,8 +518,10 @@ class BibleMediaItem(MediaManagerItem):
                 # If we were previously 'Verse Per Line' we have to add the old
                 # bible_text, because it was not added until now.
                 if bible_text:
-                    bible_text = u'%s %s \n %s %s' % (verse_text, text,
-                        verse_text, dual_text)
+                    raw_slides.append(bible_text)
+                    bible_text = u''
+                bible_text = u'%s %s \n %s %s' % (verse_text, text,
+                    verse_text, dual_text)
                 raw_slides.append(bible_text)
                 bible_text = u''
             # If we are 'Verse Per Slide' then create a new slide.