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 2021-10-05 21:54:27 +02:00
commit b945b69238
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/evtable.py
View file

@ -1116,7 +1116,7 @@ class EvTable(object):
Notes:
Beyond those table-specific keywords, the non-overlapping keywords
of `EcCell.__init__` are also available. These will be passed down
of `EvCell.__init__` are also available. These will be passed down
to every cell in the table.
"""
@ -1543,7 +1543,7 @@ class EvTable(object):
to the end.
Args:
args (`EvColum` or multiple strings): Either a single EvColumn instance or
args (`EvColumn` or multiple strings): Either a single EvColumn instance or
a number of data string arguments to be used to create a new column.
header (str, optional): The header text for the column
xpos (int, optional): Index position in table *before* which