From f57f335b0f993510f4d5b0c0922ceeb87aef8511 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Fri, 8 Apr 2016 18:03:05 +0300 Subject: [PATCH] Fixed the broken import statements. --- openlp/core/ui/advancedtab.py | 6 ------ openlp/core/ui/generaltab.py | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 0e36ae352..cf17dac4a 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -29,15 +29,9 @@ import sys from PyQt5 import QtCore, QtGui, QtWidgets -<<<<<<< TREE from openlp.core.common import AppLocation, Settings, SlideLimits, UiStrings, translate from openlp.core.lib import SettingsTab, build_icon -from openlp.core.utils import format_time -======= -from openlp.core.common import AppLocation, Settings, SlideLimits, UiStrings, translate, get_images_filter -from openlp.core.lib import ColorButton, SettingsTab, build_icon from openlp.core.common.languagemanager import format_time ->>>>>>> MERGE-SOURCE log = logging.getLogger(__name__) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index cc7ac4a3a..b0823a5d1 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -26,9 +26,8 @@ import logging from PyQt5 import QtCore, QtGui, QtWidgets -from openlp.core.common import Registry, Settings, UiStrings, translate +from openlp.core.common import Registry, Settings, UiStrings, translate, get_images_filter from openlp.core.lib import SettingsTab, ScreenList, ColorButton, build_icon -from openlp.core.utils import get_images_filter log = logging.getLogger(__name__)