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

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2019-02-03 15:45:17 +01:00
commit 74f22791d8
10 changed files with 241 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/utils.py
View file

@ -1853,7 +1853,9 @@ def at_search_result(matches, caller, query="", quiet=False, **kwargs):
Returns:
processed_result (Object or None): This is always a single result
or `None`. If `None`, any error reporting/handling should
already have happened.
already have happened. The returned object is of the type we are
checking multimatches for (e.g. Objects or Commands)
"""
error = ""