Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflict

Browse source
This commit is contained in:
Griatch 2021-02-27 13:39:14 +01:00
parent e6f0439d31
commit d100c250d5
9 changed files with 72 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/commands/default/comms.py
View file

@ -19,7 +19,8 @@ from evennia.utils import create, logger, utils, evtable
from evennia.utils.utils import make_iter, class_from_module
COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
CHANNEL_DEFAULT_TYPECLASS = class_from_module(settings.BASE_CHANNEL_TYPECLASS)
CHANNEL_DEFAULT_TYPECLASS = class_from_module(
settings.BASE_CHANNEL_TYPECLASS, fallback=settings.FALLBACK_CHANNEL_TYPECLASS)
# limit symbol import for API