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

@@ -16,7 +16,7 @@
#pragma once
#include <launch/LaunchStep.h>
#include <minecraft/auth/Account.h>
#include <minecraft/auth/MinecraftAccount.h>
class ClaimAccount: public LaunchStep
{
@@ -33,5 +33,5 @@ public:
}
private:
std::unique_ptr<UseLock> lock;
AccountPtr m_account;
MinecraftAccountPtr m_account;
};