From 4c27a7cbe5f994b0616189e67042bc51c79c2547 Mon Sep 17 00:00:00 2001 From: Thomas Groman Date: Thu, 19 Sep 2019 00:50:16 -0700 Subject: cleaned up leftover merge conflict --- application/MultiMC.h | 10 ---------- 1 file changed, 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(); -- cgit v1.2.3