From 078c8d41ebf20347aeca7e6e8bd2b0641e360898 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 3 Feb 2019 21:45:24 +0100 Subject: [PATCH] Fix unresolved conflict - for real. --- tests/interfaces/openlp_core/ui/test_mainwindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/interfaces/openlp_core/ui/test_mainwindow.py b/tests/interfaces/openlp_core/ui/test_mainwindow.py index 3dc12ce71..d87557e73 100644 --- a/tests/interfaces/openlp_core/ui/test_mainwindow.py +++ b/tests/interfaces/openlp_core/ui/test_mainwindow.py @@ -64,7 +64,7 @@ class TestMainWindow(TestCase, TestMixin): patch('openlp.core.ui.mainwindow.ProjectorManager'), \ patch('openlp.core.ui.mainwindow.websockets.WebSocketServer'), \ patch('openlp.core.ui.mainwindow.PluginForm'), \ - patch('openlp.core.ui.render.Renderer'): + patch('openlp.core.display.render.Renderer'): self.main_window = MainWindow() def tearDown(self):