Fixed merge conflict

[easylist] / requestwebpage.h

diff --git a/requestwebpage.h b/requestwebpage.h
index faf3dc1..344949f 100755 (executable)
--- a/requestwebpage.h
+++ b/requestwebpage.h
@@ -6,6 +6,7 @@
 #include <QtNetwork/QNetworkAccessManager>\r
 #include <QtNetwork/QNetworkReply>\r
 #include <QCryptographicHash>\r
+#include <QByteArray>\r
 \r
 class RequestWebpage : public QObject\r
 {\r
@@ -13,6 +14,7 @@ class RequestWebpage : public QObject
 public:\r
     explicit RequestWebpage(QObject *parent = 0);\r
     void fetch(QString url);\r
+    void post(QString url, QByteArray data);\r
 \r
 private:\r
     QNetworkAccessManager* networkManager;\r