diff options
| -rw-r--r-- | application/MultiMC.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/application/MultiMC.h b/application/MultiMC.h index 056fca88..283385b6 100644 --- a/application/MultiMC.h +++ b/application/MultiMC.h @@ -147,21 +147,11 @@ public slots: bool kill(InstancePtr instance); private slots: -<<<<<<< HEAD - void on_windowClose(); - void messageReceived(const QString & message); - void controllerSucceeded(); - void controllerFailed(const QString & error); -/* void analyticsSettingChanged(const Setting &setting, QVariant value); -*/ void setupWizardFinished(int status); -======= void on_windowClose(); void messageReceived(const QString & message); void controllerSucceeded(); void controllerFailed(const QString & error); - void analyticsSettingChanged(const Setting &setting, QVariant value); void setupWizardFinished(int status); ->>>>>>> origin/stable private: bool createSetupWizard(); |