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

Fixed the broken import statements.

This commit is contained in:
suutari-olli 2016-04-08 18:03:05 +03:00
parent 728ffd7205
commit f57f335b0f
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/advancedtab.py
View File

@ -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__)

3
openlp/core/ui/generaltab.py
View File

@ -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__)