Fix conflict

launcher/minecraft/ComponentUpdateTask_p.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <cstddef>
+#include <QString>
+#include <QList>
+#include "net/Mode.h"
+
+class PackProfile;
+
+struct RemoteLoadStatus
+{
+    enum class Type
+    {
+        Index,
+        List,
+        Version
+    } type = Type::Version;
+    size_t PackProfileIndex = 0;
+    bool finished = false;
+    bool succeeded = false;
+    QString error;
+};
+
+struct ComponentUpdateTaskData
+{
+    PackProfile * m_list = nullptr;
+    QList<RemoteLoadStatus> remoteLoadStatusList;
+    bool remoteLoadSuccessful = true;
+    size_t remoteTasksInProgress = 0;
+    ComponentUpdateTask::Mode mode;
+    Net::Mode netmode;
+};