Resolve merge conflicts

This commit is contained in:
Griatch 2020-07-18 18:06:13 +02:00
commit 8434907d9e
3 changed files with 73 additions and 1 deletions

View file

@ -143,7 +143,7 @@ class GenderCharacter(DefaultCharacter):
"""
try:
if text and isinstance(text, tuple):
text = _RE_GENDER_PRONOUN.sub(self._get_pronoun, text[0]), *text[1:]
text = (_RE_GENDER_PRONOUN.sub(self._get_pronoun, text[0]), *text[1:])
else:
text = _RE_GENDER_PRONOUN.sub(self._get_pronoun, text)
except TypeError: