From f6b7d1e9a36753425f79cc2f7900322d1b8a1811 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 24 Oct 2017 22:12:38 +0200 Subject: [PATCH] fixed merging bug --- retroshare-gui/src/retroshare-gui.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index cecc40dc7..d3a4c05c1 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -566,7 +566,7 @@ HEADERS += rshare.h \ util/RsSyntaxHighlighter.h \ util/imageutil.h \ gui/NetworkDialog/pgpid_item_model.h \ - gui/NetworkDialog/pgpid_item_proxy.h + gui/NetworkDialog/pgpid_item_proxy.h \ gui/common/RsCollection.h # gui/ForumsDialog.h \ # gui/forums/ForumDetails.h \ @@ -927,7 +927,7 @@ SOURCES += main.cpp \ util/RsSyntaxHighlighter.cpp \ util/imageutil.cpp \ gui/NetworkDialog/pgpid_item_model.cpp \ - gui/NetworkDialog/pgpid_item_proxy.cpp + gui/NetworkDialog/pgpid_item_proxy.cpp \ gui/common/RsCollection.cpp # gui/ForumsDialog.cpp \ # gui/forums/ForumDetails.cpp \