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

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2018-01-29 00:16:30 +01:00
commit 0ae76233ee
5 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/evmenu.py
View file

@ -846,10 +846,6 @@ class EvMenu(object):
else:
self.caller.msg(_HELP_NO_OPTION_MATCH, session=self._session)
if not (self.options or self.default):
# no options - we are at the end of the menu.
self.close_menu()
def display_nodetext(self):
self.caller.msg(self.nodetext, session=self._session)