Fixed merge error
This commit is contained in:
parent
46dfd32bd8
commit
49bfd8d6a4
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user