From 5e349c6c24e5a6278a56fae17f71d4403097493b Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Date: Mon, 14 Jul 2014 18:50:50 +0200
Subject: [PATCH] Merge conflict

---
 openlp/plugins/songs/lib/importer.py | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index eb8c8b4d6..0084a74de 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -160,23 +160,19 @@ class SongFormat(object):
     FoilPresenter = 8
     MediaShout = 9
     OpenSong = 10
-<<<<<<< TREE
-    PowerSong = 11
-    PresentationManager = 12
-=======
     PowerPraise = 11
     PowerSong = 12
->>>>>>> MERGE-SOURCE
-    ProPresenter = 13
-    SongBeamer = 14
-    SongPro = 15
-    SongShowPlus = 16
-    SongsOfFellowship = 17
-    SundayPlus = 18
-    WordsOfWorship = 19
-    WorshipAssistant = 20
-    WorshipCenterPro = 21
-    ZionWorx = 22
+    PresentationManager = 13
+    ProPresenter = 14
+    SongBeamer = 15
+    SongPro = 16
+    SongShowPlus = 17
+    SongsOfFellowship = 18
+    SundayPlus = 19
+    WordsOfWorship = 20
+    WorshipAssistant = 21
+    WorshipCenterPro = 22
+    ZionWorx = 23
 
     # Set optional attribute defaults
     __defaults__ = {