From 71d183d2440883dfca2d49a592d96b92055d2590 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 1 Aug 2010 09:41:09 +0100
Subject: [PATCH] Fix from merge

---
 openlp.pyw | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp.pyw b/openlp.pyw
index 7cffa7517..228bbc328 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -34,12 +34,12 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver
 from openlp.core.resources import qInitResources
-from openlp.core.ui import MainWindow, SplashScreen, ScreenList
+from openlp.core.ui.mainwindow import MainWindow
+from openlp.core.ui import SplashScreen, ScreenList
 from openlp.core.utils import AppLocation, LanguageManager, VersionThread
 
 log = logging.getLogger()
 
-
 application_stylesheet = u"""
 QMainWindow::separator
 {