Fix conflict

launcher/minecraft/update/FoldersTask.cpp

@@ -0,0 +1,21 @@
+#include "FoldersTask.h"
+#include "minecraft/MinecraftInstance.h"
+#include <QDir>
+
+FoldersTask::FoldersTask(MinecraftInstance * inst)
+    :Task()
+{
+    m_inst = inst;
+}
+
+void FoldersTask::executeTask()
+{
+    // Make directories
+    QDir mcDir(m_inst->gameRoot());
+    if (!mcDir.exists() && !mcDir.mkpath("."))
+    {
+        emitFailed(tr("Failed to create folder for minecraft binaries."));
+        return;
+    }
+    emitSucceeded();
+}