mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
one frickin stinkin merge error
This commit is contained in:
parent
6649ae568e
commit
e3580fc416
2
qtox.pro
2
qtox.pro
|
@ -164,7 +164,7 @@ SOURCES += \
|
||||||
widget/tool/chatactions/chataction.cpp \
|
widget/tool/chatactions/chataction.cpp \
|
||||||
widget/chatareawidget.cpp \
|
widget/chatareawidget.cpp \
|
||||||
filetransferinstance.cpp \
|
filetransferinstance.cpp \
|
||||||
corestructs.cpp
|
corestructs.cpp \
|
||||||
widget/tool/chatactions/messageaction.cpp \
|
widget/tool/chatactions/messageaction.cpp \
|
||||||
widget/tool/chatactions/filetransferaction.cpp \
|
widget/tool/chatactions/filetransferaction.cpp \
|
||||||
widget/tool/chatactions/systemmessageaction.cpp \
|
widget/tool/chatactions/systemmessageaction.cpp \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user