mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 11:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove <<<<<HEAD

Browse source
This commit is contained in:
Benjamin Reis 2017-10-04 11:48:17 +02:00
parent ab1e07c8b7
commit bb41aeb4de
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/content/content.cpp
View file

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