mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-09-25 19:01:09 -04:00
fixed faulty merge
This commit is contained in:
parent
d2193812a9
commit
e6bd8335dc
2 changed files with 0 additions and 2 deletions
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue