Fix merge issue

This commit is contained in:
DarkPhoenix
2020-06-09 19:11:11 +03:00
parent 81dced03bf
commit f89fe4d5d7

View File

@@ -27,7 +27,7 @@ from logbook import Logger
import gui.globalEvents as GE
import gui.mainFrame
from gui.auxFrame import AuxiliaryFrame
from gui.auxWindow import AuxiliaryFrame
from gui.bitmap_loader import BitmapLoader
from gui.builtinViews.entityEditor import BaseValidator, EntityEditor
from gui.utils.clipboard import fromClipboard, toClipboard