[Resolve merge conflicts

This commit is contained in:
Griatch 2020-09-19 14:19:40 +02:00
commit 443310b1c4
22 changed files with 76 additions and 129 deletions

View file

@ -893,7 +893,7 @@ class TestDice(CommandTest):
# Test email-login
from evennia.contrib import email_login # noqa
from evennia.contrib import email_login # noqa
class TestEmailLogin(CommandTest):