Resolve merge conflicts

2020-09-16 23:49:05 +02:00 · 2020-09-16 23:49:05 +02:00 · 9cdc37355c
commit 9cdc37355c
parent 42612c92a7 478b2eed14
25 changed files with 726 additions and 444 deletions
--- a/evennia/typeclasses/attributes.py
+++ b/evennia/typeclasses/attributes.py
@ -778,6 +778,7 @@ class InMemoryAttributeBackend(IAttributeBackend):
        See parent class.

        strvalue has no meaning for InMemory attributes.
+
        """
        new_attr = self._attrclass(
            pk=self._next_id(), key=key, category=category, lock_storage=lockstring, value=value