Fixed merge error

This commit is contained in:
gentlegiantJGC 2022-05-10 09:55:09 +01:00
parent 46dfd32bd8
commit 49bfd8d6a4

View File

@ -1,17 +1,14 @@
from typing import TYPE_CHECKING, Optional, Generator
import webbrowser
import logging
EDIT_CONFIG_ID = "amulet_edit"
from threading import Thread
import wx
EDIT_CONFIG_ID = "amulet_edit"
from amulet.api.data_types import OperationYieldType
EDIT_CONFIG_ID = "amulet_edit"
from amulet_map_editor import lang
from amulet_map_editor.api.framework.programs import BaseProgram
from amulet_map_editor.api.datatypes import MenuData