From f89fe4d5d725c6d2ced1a54456aa4b6b2e57c78e Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Tue, 9 Jun 2020 19:11:11 +0300
Subject: [PATCH] Fix merge issue

---
 gui/targetProfileEditor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/targetProfileEditor.py b/gui/targetProfileEditor.py
index 462f565b8..321953198 100644
--- a/gui/targetProfileEditor.py
+++ b/gui/targetProfileEditor.py
@@ -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