remove <<<<<HEAD

bb41aeb4 · Benjamin REIS · ab1e07c8 · bb41aeb4
Commit bb41aeb4 authored Oct 04, 2017 by Benjamin REIS
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

src/content/content.cpp src/content/content.cpp +0 -1

No files found.
--- a/src/content/content.cpp
+++ b/src/content/content.cpp
@@ -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();