raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge conflict

This commit is contained in:
Samuel Mehrbrodt 2014-07-14 18:50:50 +02:00
parent d5a3651c95
commit 5e349c6c24
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openlp/plugins/songs/lib/importer.py
View File

@ -160,23 +160,19 @@ class SongFormat(object):
FoilPresenter = 8 FoilPresenter = 8
MediaShout = 9 MediaShout = 9
OpenSong = 10 OpenSong = 10
<<<<<<< TREE
PowerSong = 11
PresentationManager = 12
=======
PowerPraise = 11 PowerPraise = 11
PowerSong = 12 PowerSong = 12
>>>>>>> MERGE-SOURCE PresentationManager = 13
ProPresenter = 13 ProPresenter = 14
SongBeamer = 14 SongBeamer = 15
SongPro = 15 SongPro = 16
SongShowPlus = 16 SongShowPlus = 17
SongsOfFellowship = 17 SongsOfFellowship = 18
SundayPlus = 18 SundayPlus = 19
WordsOfWorship = 19 WordsOfWorship = 20
WorshipAssistant = 20 WorshipAssistant = 21
WorshipCenterPro = 21 WorshipCenterPro = 22
ZionWorx = 22 ZionWorx = 23
# Set optional attribute defaults # Set optional attribute defaults
__defaults__ = { __defaults__ = {