Fix conflict again

This commit is contained in:
Sebastian-byte
2021-09-12 20:52:56 -05:00
18 changed files with 83 additions and 970 deletions

View File

@@ -129,7 +129,7 @@ void LoginDialog::onTaskProgress(qint64 current, qint64 total)
}
// Public interface
AccountPtr LoginDialog::newAccount(QWidget *parent, QString msg)
MinecraftAccountPtr LoginDialog::newAccount(QWidget *parent, QString msg)
{
LoginDialog dlg(parent);
dlg.ui->label->setText(msg);