Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 17:43:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed faulty merge

Browse source
This commit is contained in:
csoler 2025-08-13 19:32:24 +02:00
parent d2193812a9
commit e6bd8335dc
2 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View file

@ -36,7 +36,6 @@
#include "util/HandleRichText.h" #include "util/HandleRichText.h"
#include "util/misc.h" #include "util/misc.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h" #include "util/RsQtVersion.h"
#include "retroshare/rsmsgs.h" #include "retroshare/rsmsgs.h"

1
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -67,7 +67,6 @@
#include "util/DateTime.h" #include "util/DateTime.h"
#include "util/HandleRichText.h" #include "util/HandleRichText.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h" #include "util/RsQtVersion.h"
#include "textformat.h" #include "textformat.h"
#include "TagsMenu.h" #include "TagsMenu.h"