From 61b591f555547f3bdca6f7e9e24d2c3d381194bd Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Fri, 5 Aug 2016 12:57:25 -0700 Subject: [PATCH] pep8 --- openlp/plugins/songs/lib/openlyricsxml.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openlp/plugins/songs/lib/openlyricsxml.py b/openlp/plugins/songs/lib/openlyricsxml.py index a44f57a44..b4b7651af 100644 --- 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