Fix conflict

launcher/net/Validator.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "net/NetAction.h"
+
+namespace Net {
+class Validator
+{
+public: /* con/des */
+    Validator() {};
+    virtual ~Validator() {};
+
+public: /* methods */
+    virtual bool init(QNetworkRequest & request) = 0;
+    virtual bool write(QByteArray & data) = 0;
+    virtual bool abort() = 0;
+    virtual bool validate(QNetworkReply & reply) = 0;
+};
+}