Merged conflicts.

This commit is contained in:
Griatch 2015-10-19 23:32:00 +02:00
parent 48f1d0b26f
commit 50371b6abd
23 changed files with 39 additions and 39 deletions

View file

@ -576,7 +576,7 @@ def cmdhandler(called_by, raw_string, _testing=False, callertype="session", sess
except NoCmdSets:
# Critical error.
logger.log_errmsg("No cmdsets found: %s" % caller)
logger.log_err("No cmdsets found: %s" % caller)
error_to.msg(_ERROR_NOCMDSETS, _nomulti=True)
except Exception: