Merge 2.4.x trunk

2016-05-24 12:58:51 +02:00 · 2016-05-24 12:58:51 +02:00 · 505e6de924
parent d5c9fd33c5 8a53e4a991
commit 505e6de924
1 changed files with 0 additions and 1 deletions
--- a/tests/functional/openlp_core_ui/test_generaltab.py
+++ b/tests/functional/openlp_core_ui/test_generaltab.py
@ -52,4 +52,3 @@ class TestGeneralTab(TestCase):
        # THEN: Various member variables should be initialised
        self.assertEqual(mocked_screen_list, general_tab.screens)
        self.assertEqual(':/icon/openlp-logo-16x16.png', general_tab.icon_path)
-