Fix conflict

launcher/tools/MCEditTool.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <QString>
+#include "settings/SettingsObject.h"
+
+class MCEditTool
+{
+public:
+    MCEditTool(SettingsObjectPtr settings);
+    void setPath(QString & path);
+    QString path() const;
+    bool check(const QString &toolPath, QString &error);
+    QString getProgramPath();
+private:
+    SettingsObjectPtr m_settings;
+};