From 3132b2495344b178e47cceda29e39c6c0a4b4e0e Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sun, 24 May 2020 14:48:40 +0200
Subject: Fix a type collision between Messages

---
 poezio/tabs/basetabs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py
index a42ee41b..a0adb6da 100644
--- a/poezio/tabs/basetabs.py
+++ b/poezio/tabs/basetabs.py
@@ -48,7 +48,7 @@ from poezio.ui.funcs import truncate_nick
 from poezio.ui.consts import LONG_FORMAT_LENGTH
 from poezio.ui.types import BaseMessage, InfoMessage
 
-from slixmpp import JID, InvalidJID, Message
+from slixmpp import JID, InvalidJID, Message as SMessage
 
 if TYPE_CHECKING:
     from _curses import _CursesWindow  # pylint: disable=E0611
@@ -638,7 +638,7 @@ class ChatTab(Tab):
         if message:
             message.send()
 
-    def generate_xhtml_message(self, arg: str) -> Message:
+    def generate_xhtml_message(self, arg: str) -> SMessage:
         if not arg:
             return
         try:
-- 
cgit v1.2.3