Fix conflict

launcher/modplatform/flame/FileResolvingTask.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "tasks/Task.h"
+#include "net/NetJob.h"
+#include "PackManifest.h"
+
+namespace Flame
+{
+class FileResolvingTask : public Task
+{
+    Q_OBJECT
+public:
+    explicit FileResolvingTask(Flame::Manifest &toProcess);
+    virtual ~FileResolvingTask() {};
+
+    const Flame::Manifest &getResults() const
+    {
+        return m_toProcess;
+    }
+
+protected:
+    virtual void executeTask() override;
+
+protected slots:
+    void netJobFinished();
+
+private: /* data */
+    Flame::Manifest m_toProcess;
+    QVector<QByteArray> results;
+    NetJobPtr m_dljob;
+};
+}