From d91a2d31e8b376675d0185c9056d9338912bebe5 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 13 Sep 2020 00:25:13 +0200 Subject: [PATCH] fixed merge --- retroshare-gui/src/retroshare-gui.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index f3ef6895c..ab02f16a1 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -1373,11 +1373,10 @@ gxschannels { gui/feeds/GxsChannelPostItem.ui SOURCES += gui/gxschannels/GxsChannelDialog.cpp \ - gui/gxschannels/GxsChannelPostsModel.cpp \ gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \ + gui/gxschannels/GxsChannelPostsModel.cpp \ gui/gxschannels/GxsChannelPostFilesModel.cpp \ gui/gxschannels/GxsChannelFilesStatusWidget.cpp \ - gui/gxschannels/GxsChannelFilesWidget.cpp \ gui/gxschannels/GxsChannelPostThumbnail.cpp \ gui/gxschannels/GxsChannelGroupDialog.cpp \ gui/gxschannels/CreateGxsChannelMsg.cpp \