pep8

2016-08-05 12:57:25 -07:00 · 2016-08-05 12:57:25 -07:00 · 61b591f555
commit 61b591f555
parent 2f7a1ab456
1 changed files with 0 additions and 4 deletions
--- a/openlp/plugins/songs/lib/openlyricsxml.py
+++ b/openlp/plugins/songs/lib/openlyricsxml.py
@ -643,11 +643,7 @@ class OpenLyrics(object):
        # Append text from tail and add formatting end tag.
        # TODO: Verify format() with template variables
        if element.tag == NSMAP % 'tag' and use_endtag:
-<<<<<<< TREE
            text += '{{/{name}}}'.format(name=element.get('name'))
-=======
-            text += '{{{name}}}'.format(name=element.get('name'))
->>>>>>> MERGE-SOURCE
        # Append text from tail.
        if element.tail:
            text += element.tail