Good idea to test conflict resolutions before committing

2010-03-10 22:32:27 +00:00 · 2010-03-10 22:32:27 +00:00 · 1613610853
commit 1613610853
parent 99a963e509
1 changed files with 0 additions and 1 deletions
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@ -310,4 +310,3 @@ class PowerpointDocument(PresentationDocument):
            if shape.HasTextFrame:
                text += shape.TextFrame.TextRange.Text + '\n'
        return text
-s