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

Fix unresolved conflict - for real.

Browse Source
This commit is contained in:
Tomas Groth 2019-02-03 21:45:24 +01:00
parent aa5554a696
commit 078c8d41eb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/interfaces/openlp_core/ui/test_mainwindow.py
View File

@ -64,7 +64,7 @@ class TestMainWindow(TestCase, TestMixin):
patch('openlp.core.ui.mainwindow.ProjectorManager'), \ patch('openlp.core.ui.mainwindow.ProjectorManager'), \
patch('openlp.core.ui.mainwindow.websockets.WebSocketServer'), \ patch('openlp.core.ui.mainwindow.websockets.WebSocketServer'), \
patch('openlp.core.ui.mainwindow.PluginForm'), \ patch('openlp.core.ui.mainwindow.PluginForm'), \
patch('openlp.core.ui.render.Renderer'): patch('openlp.core.display.render.Renderer'):
self.main_window = MainWindow() self.main_window = MainWindow()
def tearDown(self): def tearDown(self):