fixed merging bug

This commit is contained in:
csoler 2017-10-24 22:12:38 +02:00
parent f959218a24
commit f6b7d1e9a3

View File

@ -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 \