Add fix so there is no merge conflict

This commit is contained in:
LajamerrMittesdine 2018-07-12 15:44:12 -04:00
parent 96012d5081
commit e2836c24a3

View file

@ -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(