Fix merge conflicts

2019-01-17 23:08:19 +01:00 · 2019-01-17 23:08:19 +01:00 · 690ed6ecd1
commit 690ed6ecd1
parent 72644c6f57 f33407802d
5 changed files with 1763 additions and 9 deletions
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@ -432,6 +432,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
            # only allow exact matching if searching the entire database
            # or unique #dbrefs
            exact = True
+            candidates = None

        elif candidates is None:
            # no custom candidates given - get them automatically