mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
Add fix so there is no merge conflict
This commit is contained in:
parent
96012d5081
commit
e2836c24a3
1 changed files with 2 additions and 2 deletions
|
@ -130,7 +130,7 @@ void TwitchAccount::ignore(const QString &targetName,
|
|||
this->ignoreByID(targetUserId, targetName, onFinished); //
|
||||
};
|
||||
|
||||
PartialTwitchUser::byName(this->userName_).getId(onIdFetched);
|
||||
PartialTwitchUser::byName(targetName).getId(onIdFetched);
|
||||
}
|
||||
|
||||
void TwitchAccount::ignoreByID(const QString &targetUserID, const QString &targetName,
|
||||
|
@ -197,7 +197,7 @@ void TwitchAccount::unignore(const QString &targetName,
|
|||
this->unignoreByID(targetUserId, targetName, onFinished); //
|
||||
};
|
||||
|
||||
PartialTwitchUser::byName(this->userName_).getId(onIdFetched);
|
||||
PartialTwitchUser::byName(targetName).getId(onIdFetched);
|
||||
}
|
||||
|
||||
void TwitchAccount::unignoreByID(
|
||||
|
|
Loading…
Reference in a new issue