forked from openlp/openlp
fixed stuff messed up resolvesing the conflict
This commit is contained in:
parent
8071a65720
commit
14dbfaa4b5
@ -518,6 +518,8 @@ 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:
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user