Merge lp:~raoul-snyman/openlp/fix-author-type-2.4 into lp:openlp/2.4
Status: | Merged |
---|---|
Merged at revision: | 2680 |
Proposed branch: | lp:~raoul-snyman/openlp/fix-author-type-2.4 |
Merge into: | lp:openlp/2.4 |
Diff against target: |
172 lines (+85/-11) 6 files modified
openlp/core/ui/slidecontroller.py (+3/-1) openlp/plugins/songs/lib/importers/openlp.py (+6/-6) tests/functional/openlp_core/test_init.py (+72/-0) tests/functional/openlp_core_ui/test_slidecontroller.py (+1/-1) tests/functional/openlp_plugins/songs/test_openlpimporter.py (+2/-2) tests/resources/opensongsongs/Amazing Grace.json (+1/-1) |
To merge this branch: | bzr merge lp:~raoul-snyman/openlp/fix-author-type-2.4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Tomas Groth | Approve | ||
Review via email: mp+321137@code.launchpad.net |
Commit message
Fix the author_type import properly
Description of the change
Fix the author_type import properly
Add this to your merge proposal:
-------
lp:~raoul-snyman/openlp/fix-author-type-2.4 (revision 2681)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
I'm gonna trust you on this one...