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

Fix unresolved conflict.

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

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

@ -63,13 +63,8 @@ class TestMainWindow(TestCase, TestMixin):
patch('openlp.core.ui.mainwindow.ThemeManager'), \ patch('openlp.core.ui.mainwindow.ThemeManager'), \
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'), \
<<<<<<< TREE
patch('openlp.core.ui.mainwindow.PluginForm'), \ patch('openlp.core.ui.mainwindow.PluginForm'), \
patch('openlp.core.ui.mainwindow.server.HttpServer'): patch('openlp.core.ui.render.Renderer'):
=======
patch('openlp.core.ui.mainwindow.server.HttpServer'), \
patch('openlp.core.ui.mainwindow.Renderer'):
>>>>>>> MERGE-SOURCE
self.main_window = MainWindow() self.main_window = MainWindow()
def tearDown(self): def tearDown(self):