From aa5554a696fa80542747ba3cdb24701849617ac5 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 3 Feb 2019 21:44:46 +0100 Subject: [PATCH] Fix unresolved conflict. --- tests/interfaces/openlp_core/ui/test_mainwindow.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/interfaces/openlp_core/ui/test_mainwindow.py b/tests/interfaces/openlp_core/ui/test_mainwindow.py index ae4b11a50..3dc12ce71 100644 --- a/tests/interfaces/openlp_core/ui/test_mainwindow.py +++ b/tests/interfaces/openlp_core/ui/test_mainwindow.py @@ -63,13 +63,8 @@ class TestMainWindow(TestCase, TestMixin): patch('openlp.core.ui.mainwindow.ThemeManager'), \ patch('openlp.core.ui.mainwindow.ProjectorManager'), \ patch('openlp.core.ui.mainwindow.websockets.WebSocketServer'), \ -<<<<<<< TREE patch('openlp.core.ui.mainwindow.PluginForm'), \ - patch('openlp.core.ui.mainwindow.server.HttpServer'): -======= - patch('openlp.core.ui.mainwindow.server.HttpServer'), \ - patch('openlp.core.ui.mainwindow.Renderer'): ->>>>>>> MERGE-SOURCE + patch('openlp.core.ui.render.Renderer'): self.main_window = MainWindow() def tearDown(self):