Fix conflict

launcher/minecraft/update/FoldersTask.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "tasks/Task.h"
+
+class MinecraftInstance;
+class FoldersTask : public Task
+{
+    Q_OBJECT
+public:
+    FoldersTask(MinecraftInstance * inst);
+    virtual ~FoldersTask() {};
+
+    void executeTask() override;
+private:
+    MinecraftInstance *m_inst;
+};
+