one frickin stinkin merge error

11 years ago · e3580fc416
1 changed files with 1 additions and 1 deletions
--- a/qtox.pro
+++ b/qtox.pro
@ -164,7 +164,7 @@ SOURCES += \
				@@ -164,7 +164,7 @@ SOURCES += \
    widget/tool/chatactions/chataction.cpp \
    widget/chatareawidget.cpp \
    filetransferinstance.cpp \
-    corestructs.cpp
+    corestructs.cpp \
    widget/tool/chatactions/messageaction.cpp \
    widget/tool/chatactions/filetransferaction.cpp \
    widget/tool/chatactions/systemmessageaction.cpp \