Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix lolimi api #57

Closed
wants to merge 2 commits into from
Closed

fix lolimi api #57

wants to merge 2 commits into from

Conversation

YumeMichi
Copy link

与另一个pr类似,仅修复已有的两个接口。
关联zbp修改:YumeMichi/ZeroBot-Plugin@c4e6dca

YumeMichi and others added 2 commits August 22, 2024 05:00
添加key参数,在桑帛云API后台-密钥管理下

Signed-off-by: Sean Du <do4suki@gmail.com>
@fumiama
Copy link
Member

fumiama commented Aug 22, 2024

但是你和他的更改是冲突的,我只能选一个合并。

@EatHatsuneShallots
Copy link
Contributor

但是你和他的更改是冲突的,我只能选一个合并。

可以先合并他的(相当于补丁),然后我解决完冲突后,同样可以合并我的(相当于添加新内容)

@fumiama
Copy link
Member

fumiama commented Aug 22, 2024

OK了

@YumeMichi YumeMichi closed this Aug 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants