openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

fix merge issues

This commit is contained in:
Tomas Groth 2024-03-28 00:00:45 +01:00
parent 14bcbf65c6
commit ec48646640
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/app.py
View File

@ -35,7 +35,7 @@ from pathlib import Path
from shutil import copytree, move
from traceback import format_exception
from PySide6 import QtCore, QtWebEngineCore, QtWidgets # noqa
from PySide6 import QtCore, QtGui, QtWebEngineCore, QtWidgets # noqa
from openlp.core.api.deploy import check_for_remote_update
from openlp.core.common.applocation import AppLocation

7
tests/openlp_plugins/songs/forms/test_songmaintenanceform.py
View File

@ -214,13 +214,8 @@ def test_delete_book_assigned(mocked_critical_error_message_box: MagicMock, main
mocked_item = create_autospec(SongBook, spec_set=True)
mocked_item.id = 1
mocked_item.songs = [MagicMock(title='Amazing Grace')]
<<<<<<< HEAD
mocked_manager.get_object.return_value = mocked_item
mocked_critical_error_message_box.return_value = QtWidgets.QMessageBox.StandardButton.Yes
=======
maintenance_form.manager.get_object.return_value = mocked_item
mocked_critical_error_message_box.return_value = QtWidgets.QMessageBox.Yes
>>>>>>> master
mocked_critical_error_message_box.return_value = QtWidgets.QMessageBox.StandardButton.Yes
mocked_list_widget = MagicMock()
mocked_reset_func = MagicMock()
dialog_title = 'Delete Book'