forked from openlp/openlp
Fixed the broken import statements.
This commit is contained in:
parent
728ffd7205
commit
f57f335b0f
@ -29,15 +29,9 @@ import sys
|
|||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||||
|
|
||||||
<<<<<<< TREE
|
|
||||||
from openlp.core.common import AppLocation, Settings, SlideLimits, UiStrings, translate
|
from openlp.core.common import AppLocation, Settings, SlideLimits, UiStrings, translate
|
||||||
from openlp.core.lib import SettingsTab, build_icon
|
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
|
from openlp.core.common.languagemanager import format_time
|
||||||
>>>>>>> MERGE-SOURCE
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -26,9 +26,8 @@ import logging
|
|||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
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.lib import SettingsTab, ScreenList, ColorButton, build_icon
|
||||||
from openlp.core.utils import get_images_filter
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user