diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:50:16 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:50:16 -0700 |
| commit | 4c27a7cbe5f994b0616189e67042bc51c79c2547 (patch) | |
| tree | 6387ebc826f799968e6b35e8ac336e0cca19bdad | |
| parent | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (diff) | |
| download | MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar.gz MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar.lz MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar.xz MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.zip | |
cleaned up leftover merge conflict
| -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(); |