Commit bb41aeb4 authored by Benjamin REIS's avatar Benjamin REIS
Browse files

remove <<<<<HEAD

parent ab1e07c8
...@@ -71,7 +71,6 @@ Content &Content::operator= (Content &&src) { ...@@ -71,7 +71,6 @@ Content &Content::operator= (Content &&src) {
return *this; return *this;
} }
<<<<<<< HEAD
bool Content::operator==(const Content& content) const { bool Content::operator==(const Content& content) const {
L_D(); L_D();
return d->contentType == content.getContentType() && d->body == content.getBody() && d->contentDisposition == content.getContentDisposition(); return d->contentType == content.getContentType() && d->body == content.getBody() && d->contentDisposition == content.getContentDisposition();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment