Fix merge conflicts

2019-03-04 22:32:51 +01:00 · 2019-03-04 22:32:51 +01:00 · 90b42ca6fb
commit 90b42ca6fb
parent 645b65c34e 8235a7e870
47 changed files with 1682 additions and 201 deletions
--- a/evennia/utils/text2html.py
+++ b/evennia/utils/text2html.py
@ -215,6 +215,7 @@ class TextToHTMLparser(object):
            text (str): Processed text.

        """
+        return text
        return text.replace(r'\n', r'<br>')

    def convert_urls(self, text):