From e3580fc416dd5ed298899016ba6759e320c4e264 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Tue, 30 Sep 2014 05:02:49 -0500
Subject: [PATCH] one frickin stinkin merge error

---
 qtox.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtox.pro b/qtox.pro
index ad0d839c2..68ab4db73 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -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 \