From de6283928d2acea29f5922b9e87c5c6f1d51d815 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 19 Mar 2018 17:26:35 +0100
Subject: [PATCH] Fixed issue with merge

---
 src/chat/modifier/file-transfer-chat-message-modifier.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/chat/modifier/file-transfer-chat-message-modifier.cpp b/src/chat/modifier/file-transfer-chat-message-modifier.cpp
index fcdf15842..14733e4c8 100644
--- a/src/chat/modifier/file-transfer-chat-message-modifier.cpp
+++ b/src/chat/modifier/file-transfer-chat-message-modifier.cpp
@@ -298,7 +298,6 @@ void FileTransferChatMessageModifier::processResponseFromPostFile (const belle_h
 			if (body && strlen(body) > 0) {
 				FileTransferContent *fileTransferContent = new FileTransferContent();
 				fileTransferContent->setContentType(ContentType::FileTransfer);
-				message->addContent(fileTransferContent);
 
 				LinphoneImEncryptionEngine *imee = linphone_core_get_im_encryption_engine(message->getCore()->getCCore());
 				bool_t is_file_encryption_enabled = FALSE;