fix build issues

src/chat/chat-message.cpp

@@ -1441,7 +1441,7 @@ void ChatMessage::cancelFileTransfer() {
 		}
 		if (!belle_http_request_is_cancelled(d->httpRequest)) {
 			if (d->chatRoom) {
-				lInfo() << "Canceling file transfer " << (d->externalBodyUrl.empty()) ? linphone_core_get_file_transfer_server(d->chatRoom->getCore()) : d->externalBodyUrl.c_str();
+				lInfo() << "Canceling file transfer " << (d->externalBodyUrl.empty() ? linphone_core_get_file_transfer_server(d->chatRoom->getCore()) : d->externalBodyUrl.c_str());
 				belle_http_provider_cancel_request(d->chatRoom->getCore()->http_provider, d->httpRequest);
 			} else {
 				lInfo() << "Warning: http request still running for ORPHAN msg: this is a memory leak";

src/content/content.cpp

@@ -71,7 +71,8 @@ Content &Content::operator= (Content &&src) {
 	return *this;
 }
 
-bool Content::operator==(const Content& content) {
+<<<<<<< HEAD
+bool Content::operator==(const Content& content) const {
 	L_D();
 	return d->contentType == content.getContentType() && d->body == content.getBody() && d->contentDisposition == content.getContentDisposition();
 }

src/content/content.h

@@ -38,7 +38,7 @@ public:
 
 	Content &operator= (const Content &src);
 	Content &operator= (Content &&src);
-	bool operator==(const Content& content);
+	bool operator==(const Content& content) const;
 
 	const ContentType &getContentType () const;
 	void setContentType (const ContentType &contentType);