From e6bd8335dc1c0bd87e839199ce444584c3dcd68e Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 13 Aug 2025 19:32:24 +0200 Subject: [PATCH] fixed faulty merge --- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 1 - retroshare-gui/src/gui/msgs/MessageComposer.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 7d416d449..9a7b51756 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -36,7 +36,6 @@ #include "util/HandleRichText.h" #include "util/misc.h" #include "util/qtthreadsutils.h" -#include "util/QtVersion.h" #include "util/RsQtVersion.h" #include "retroshare/rsmsgs.h" diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 27cbf1f2f..2c07e1f58 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -67,7 +67,6 @@ #include "util/DateTime.h" #include "util/HandleRichText.h" #include "util/qtthreadsutils.h" -#include "util/QtVersion.h" #include "util/RsQtVersion.h" #include "textformat.h" #include "TagsMenu.h"