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

Test #16

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Test #16

wants to merge 40 commits into from

Conversation

NyanCat12
Copy link

处理了冲突

拆分模块,截图、识别、搜索
截图按照不同分辨率适配,每到题目截出问题和三个选项
改成百度识别
添加搜索结果数识别
处理冲突
@wuditken
Copy link
Owner

我这边还是显示冲突

This branch has conflicts that must be resolved
Use the web editor or thecommand line to resolve conflicts.
Conflicting files

@wuditken
Copy link
Owner

你拉取的是最新代码吗?

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.

None yet

2 participants